Merge pull request #284 from mmuetzel/mingw

Example: update cmake modules and LDL version.
DrTimothyAldenDavis · Jan 21, 2023 · 42de2d8 · 42de2d8
2 parents 52a2339 + bc1eec5
commit 42de2d8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt
@@ -71,7 +71,7 @@ find_package ( GPUQREngine 2.0.3 REQUIRED )
 find_package ( GraphBLAS 7.4.1 REQUIRED )
 find_package ( KLU 2.0.3 REQUIRED )
 find_package ( KLU_CHOLMOD 2.0.3 REQUIRED )
-find_package ( LDL 2.0.3 REQUIRED )
+find_package ( LDL 3.0.3 REQUIRED )
 find_package ( Mongoose 3.0.4 REQUIRED )
 find_package ( RBio 3.0.3 REQUIRED )
 find_package ( SPEX 2.0.3 REQUIRED )

diff --git a/Example/cmake_modules/FindGMP.cmake b/Example/cmake_modules/FindGMP.cmake
@@ -17,8 +17,6 @@
 # GMP_LIBRARIES   - libraries when using gmp
 # GMP_FOUND       - true if gmp found
 
-# For MS Visual Studio, GMP_LIBRARY and GMP_STATIC are the same.
-
 # set ``GMP_ROOT`` to a gmp installation root to
 # tell this module where to look.
 
@@ -29,7 +27,7 @@
 
 if ( DEFINED ENV{CMAKE_PREFIX_PATH} )
     # import CMAKE_PREFIX_PATH, typically created by spack
-    set ( CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH} )
+    list ( PREPEND CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH} )
 endif ( )
 
 # include files for gmp
@@ -44,12 +42,12 @@ find_library ( GMP_LIBRARY
     PATH_SUFFIXES lib build
 )
 
+# static gmp library
 if ( NOT MSVC )
     set ( CMAKE_FIND_LIBRARY_SUFFIXES
         ${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_FIND_LIBRARY_SUFFIXES} )
 endif ( )
 
-# static gmp library
 find_library ( GMP_STATIC
     NAMES gmp
     PATH_SUFFIXES lib build

diff --git a/Example/cmake_modules/FindMPFR.cmake b/Example/cmake_modules/FindMPFR.cmake
@@ -17,8 +17,6 @@
 # MPFR_LIBRARIES   - libraries when using mpfr
 # MPFR_FOUND       - true if mpfr found
 
-# For MS Visual Studio, MPFR_LIBRARY and MPFR_STATIC are the same.
-
 # set ``MPFR_ROOT`` to a mpfr installation root to
 # tell this module where to look.
 
@@ -29,7 +27,7 @@
 
 if ( DEFINED ENV{CMAKE_PREFIX_PATH} )
     # import CMAKE_PREFIX_PATH, typically created by spack
-    set ( CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH} )
+    list ( PREPEND CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH} )
 endif ( )
 
 # include files for mpfr
@@ -44,17 +42,21 @@ find_library ( MPFR_LIBRARY
     PATH_SUFFIXES lib build
 )
 
+# static mpfr library
 if ( NOT MSVC )
     set ( CMAKE_FIND_LIBRARY_SUFFIXES
         ${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_FIND_LIBRARY_SUFFIXES} )
 endif ( )
 
-# static mpfr library
 find_library ( MPFR_STATIC
     NAMES mpfr
     PATH_SUFFIXES lib build
 )
 
+if ( NOT MPFR_STATIC )
+    set ( MPFR_STATIC ${MPFR_LIBRARY} )
+endif ( )
+
 if ( NOT MSVC )
     # restore the CMAKE_FIND_LIBRARY_SUFFIXES variable
     set ( CMAKE_FIND_LIBRARY_SUFFIXES ${save} )