Merge pull request #391 from DrTimothyAldenDavis/dev2

pkg-config updates from Markus
DrTimothyAldenDavis · Sep 12, 2023 · 68b13f7 · 68b13f7
2 parents 13c49ed + 299427f
commit 68b13f7
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 10 deletions.
diff --git a/CHOLMOD/CMakeLists.txt b/CHOLMOD/CMakeLists.txt
@@ -569,7 +569,11 @@ if ( NOT MSVC )
             set ( CHOLMOD_STATIC_LIBS "${CHOLMOD_STATIC_LIBS} -l${_lib}" )
             continue ()
         endif ( )
-        foreach ( _kind IN ITEMS "IMPORT" "SHARED" "STATIC" )
+        set ( _kinds "SHARED" "STATIC" )
+        if ( WIN32 )
+            list ( PREPEND _kinds "IMPORT" )
+        endif ( )
+        foreach ( _kind IN LISTS _kinds )
             set ( _regex ".*\\/(lib)?([^\\.]*)(${CMAKE_${_kind}_LIBRARY_SUFFIX})" )
             if ( ${_lib} MATCHES ${_regex} )
                 string ( REGEX REPLACE ${_regex} "\\2" _libname ${_lib} )

diff --git a/GraphBLAS/CMakeLists.txt b/GraphBLAS/CMakeLists.txt
@@ -520,7 +520,11 @@ if ( NOT MSVC )
             set ( GRAPHBLAS_STATIC_LIBS "${GRAPHBLAS_STATIC_LIBS} -l${_lib}" )
             continue ()
         endif ( )
-        foreach ( _kind IN ITEMS "IMPORT" "SHARED" "STATIC" )
+        set ( _kinds "SHARED" "STATIC" )
+        if ( WIN32 )
+            list ( PREPEND _kinds "IMPORT" )
+        endif ( )
+        foreach ( _kind IN LISTS _kinds )
             set ( _regex ".*\\/(lib)?([^\\.]*)(${CMAKE_${_kind}_LIBRARY_SUFFIX})" )
             if ( ${_lib} MATCHES ${_regex} )
                 string ( REGEX REPLACE ${_regex} "\\2" _libname ${_lib} )

diff --git a/SPEX/CMakeLists.txt b/SPEX/CMakeLists.txt
@@ -243,12 +243,16 @@ if ( NOT MSVC )
     set ( SPEX_STATIC_LIBS_LIST ${SPEX_STATIC_LIBS} )
     set ( SPEX_STATIC_LIBS "" )
     foreach ( _lib ${SPEX_STATIC_LIBS_LIST} )
-            string ( FIND ${_lib} "." _pos REVERSE )
-            if ( ${_pos} EQUAL "-1" )
-                set ( SPEX_STATIC_LIBS "${SPEX_STATIC_LIBS} -l${_lib}" )
-                continue ()
-            endif ( )
-        foreach ( _kind IN ITEMS "IMPORT" "SHARED" "STATIC" )
+        string ( FIND ${_lib} "." _pos REVERSE )
+        if ( ${_pos} EQUAL "-1" )
+            set ( SPEX_STATIC_LIBS "${SPEX_STATIC_LIBS} -l${_lib}" )
+            continue ()
+        endif ( )
+        set ( _kinds "SHARED" "STATIC" )
+        if ( WIN32 )
+            list ( PREPEND _kinds "IMPORT" )
+        endif ( )
+        foreach ( _kind IN LISTS _kinds )
             set ( _regex ".*\\/(lib)?([^\\.]*)(${CMAKE_${_kind}_LIBRARY_SUFFIX})" )
             if ( ${_lib} MATCHES ${_regex} )
                 string ( REGEX REPLACE ${_regex} "\\2" _libname ${_lib} )

diff --git a/SPQR/CMakeLists.txt b/SPQR/CMakeLists.txt
@@ -355,7 +355,11 @@ if ( NOT MSVC )
             set ( SPQR_STATIC_LIBS "${SPQR_STATIC_LIBS} -l${_lib}" )
             continue ()
         endif ( )
-        foreach ( _kind IN ITEMS "IMPORT" "SHARED" "STATIC" )
+        set ( _kinds "SHARED" "STATIC" )
+        if ( WIN32 )
+            list ( PREPEND _kinds "IMPORT" )
+        endif ( )
+        foreach ( _kind IN LISTS _kinds )
             set ( _regex ".*\\/(lib)?([^\\.]*)(${CMAKE_${_kind}_LIBRARY_SUFFIX})" )
             if ( ${_lib} MATCHES ${_regex} )
                 string ( REGEX REPLACE ${_regex} "\\2" _libname ${_lib} )

diff --git a/UMFPACK/CMakeLists.txt b/UMFPACK/CMakeLists.txt
@@ -329,7 +329,11 @@ if ( NOT MSVC )
             set ( UMFPACK_STATIC_LIBS "${UMFPACK_STATIC_LIBS} -l${_lib}" )
             continue ()
         endif ( )
-        foreach ( _kind IN ITEMS "IMPORT" "SHARED" "STATIC" )
+        set ( _kinds "SHARED" "STATIC" )
+        if ( WIN32 )
+            list ( PREPEND _kinds "IMPORT" )
+        endif ( )
+        foreach ( _kind IN LISTS _kinds )
             set ( _regex ".*\\/(lib)?([^\\.]*)(${CMAKE_${_kind}_LIBRARY_SUFFIX})" )
             if ( ${_lib} MATCHES ${_regex} )
                 string ( REGEX REPLACE ${_regex} "\\2" _libname ${_lib} )