Merge branch 'master' into psconvert-no-file-dup

GenericMappingTools · Nov 20, 2024 · 7e2a38d · 7e2a38d
2 parents 29f0aa5 + bfdd58d
commit 7e2a38d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -230,11 +230,11 @@ else (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
 	set (ACCELERATE_NEW_LAPACK 0)
 endif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
 
-if (HAVE_LAPACK AND ACCELERATE_NEW_LAPACK GREATER 0)
+if (HAVE_LAPACK AND ACCELERATE_NEW_LAPACK GREATER 0 AND LAPACK_LIBRARIES MATCHES ".*Accelerate.*")
 	# Recent macOS with Darwin kernel > 22.4 needs this compiler flag:
 	add_compile_definitions(ACCELERATE_NEW_LAPACK)
 	message("-- Must add compiler flag -DACCELERATE_NEW_LAPACK definition for macOS kernel version ${CMAKE_HOST_SYSTEM_VERSION}")
-endif (HAVE_LAPACK AND ACCELERATE_NEW_LAPACK GREATER 0)
+endif (HAVE_LAPACK AND ACCELERATE_NEW_LAPACK GREATER 0 AND LAPACK_LIBRARIES MATCHES ".*Accelerate.*")
 
 if (NOT DEFINED GMT_EXCLUDE_BLAS)
 	find_package (BLAS)

diff --git a/src/gmt_notposix.h b/src/gmt_notposix.h
@@ -331,8 +331,8 @@
 
 #ifndef NAN
 #	ifdef _MSC_VER
-#		include <ymath.h>
-#		define NAN _Nan._Double
+		static const double _NAN = (-(float)(((float)(1e+300 * 1e+300)) * 0.0F));
+#		define NAN _NAN
 #	else /* _MSC_VER */
 		static const double _NAN = (HUGE_VAL-HUGE_VAL);
 #		define NAN _NAN