Rename CMake target "suitesparseconfig" to "SuiteSparseConfig"

DrTimothyAldenDavis · Jul 14, 2023 · 3b60b98 · 3b60b98
1 parent 21cd2b4
commit 3b60b98
Show file tree

Hide file tree

Showing 22 changed files with 149 additions and 149 deletions.
diff --git a/AMD/CMakeLists.txt b/AMD/CMakeLists.txt
@@ -58,7 +58,7 @@ endif ( )
 
 find_package ( SuiteSparse_config 7.1.0
     PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
-if ( NOT TARGET SuiteSparse::suitesparseconfig )
+if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
     find_package ( SuiteSparse_config 7.1.0 REQUIRED )
 endif ( )
 
@@ -128,15 +128,15 @@ endif ( )
 # add the library dependencies
 #-------------------------------------------------------------------------------
 
-# suitesparseconfig:
-target_link_libraries ( amd PRIVATE SuiteSparse::suitesparseconfig )
+# SuiteSparseConfig:
+target_link_libraries ( amd PRIVATE SuiteSparse::SuiteSparseConfig )
 target_include_directories ( amd PUBLIC
-    "$<TARGET_PROPERTY:SuiteSparse::suitesparseconfig,INTERFACE_INCLUDE_DIRECTORIES>" )
+    "$<TARGET_PROPERTY:SuiteSparse::SuiteSparseConfig,INTERFACE_INCLUDE_DIRECTORIES>" )
 if ( NOT NSTATIC )
-    if ( TARGET SuiteSparse::suitesparseconfig_static )
-        target_link_libraries ( amd_static PUBLIC SuiteSparse::suitesparseconfig_static )
+    if ( TARGET SuiteSparse::SuiteSparseConfig_static )
+        target_link_libraries ( amd_static PUBLIC SuiteSparse::SuiteSparseConfig_static )
     else ( )
-        target_link_libraries ( amd_static PUBLIC SuiteSparse::suitesparseconfig )
+        target_link_libraries ( amd_static PUBLIC SuiteSparse::SuiteSparseConfig )
     endif ( )
 endif ( )
 

diff --git a/BTF/CMakeLists.txt b/BTF/CMakeLists.txt
@@ -45,7 +45,7 @@ project ( btf
 
 find_package ( SuiteSparse_config 7.1.0
     PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
-if ( NOT TARGET SuiteSparse::suitesparseconfig )
+if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
     find_package ( SuiteSparse_config 7.1.0 REQUIRED )
 endif ( )
 
@@ -111,15 +111,15 @@ endif ( )
 # add the library dependencies
 #-------------------------------------------------------------------------------
 
-# suitesparseconfig:
-target_link_libraries ( btf PRIVATE SuiteSparse::suitesparseconfig )
+# SuiteSparseConfig:
+target_link_libraries ( btf PRIVATE SuiteSparse::SuiteSparseConfig )
 target_include_directories ( btf PUBLIC
-    "$<TARGET_PROPERTY:SuiteSparse::suitesparseconfig,INTERFACE_INCLUDE_DIRECTORIES>" )
+    "$<TARGET_PROPERTY:SuiteSparse::SuiteSparseConfig,INTERFACE_INCLUDE_DIRECTORIES>" )
 if ( NOT NSTATIC )
-    if ( TARGET SuiteSparse::suitesparseconfig_static )
-        target_link_libraries ( btf_static PUBLIC SuiteSparse::suitesparseconfig_static )
+    if ( TARGET SuiteSparse::SuiteSparseConfig_static )
+        target_link_libraries ( btf_static PUBLIC SuiteSparse::SuiteSparseConfig_static )
     else ( )
-        target_link_libraries ( btf_static PUBLIC SuiteSparse::suitesparseconfig )
+        target_link_libraries ( btf_static PUBLIC SuiteSparse::SuiteSparseConfig )
     endif ( )
 endif ( )
 

diff --git a/CAMD/CMakeLists.txt b/CAMD/CMakeLists.txt
@@ -44,7 +44,7 @@ project ( camd
 
 find_package ( SuiteSparse_config 7.1.0
     PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
-if ( NOT TARGET SuiteSparse::suitesparseconfig )
+if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
     find_package ( SuiteSparse_config 7.1.0 REQUIRED )
 endif ( )
 
@@ -114,14 +114,14 @@ endif ( )
 # add the library dependencies
 #-------------------------------------------------------------------------------
 
-target_link_libraries ( camd PRIVATE SuiteSparse::suitesparseconfig )
+target_link_libraries ( camd PRIVATE SuiteSparse::SuiteSparseConfig )
 target_include_directories ( camd PUBLIC
-    "$<TARGET_PROPERTY:SuiteSparse::suitesparseconfig,INTERFACE_INCLUDE_DIRECTORIES>" )
+    "$<TARGET_PROPERTY:SuiteSparse::SuiteSparseConfig,INTERFACE_INCLUDE_DIRECTORIES>" )
 if ( NOT NSTATIC )
-    if ( TARGET SuiteSparse::suitesparseconfig_static )
-        target_link_libraries ( camd_static PUBLIC SuiteSparse::suitesparseconfig_static )
+    if ( TARGET SuiteSparse::SuiteSparseConfig_static )
+        target_link_libraries ( camd_static PUBLIC SuiteSparse::SuiteSparseConfig_static )
     else ( )
-        target_link_libraries ( camd_static PUBLIC SuiteSparse::suitesparseconfig )
+        target_link_libraries ( camd_static PUBLIC SuiteSparse::SuiteSparseConfig )
     endif ( )
 endif ( )
 

diff --git a/CCOLAMD/CMakeLists.txt b/CCOLAMD/CMakeLists.txt
@@ -44,7 +44,7 @@ project ( ccolamd
 
 find_package ( SuiteSparse_config 7.1.0
     PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
-if ( NOT TARGET SuiteSparse::suitesparseconfig )
+if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
     find_package ( SuiteSparse_config 7.1.0 REQUIRED )
 endif ( )
 
@@ -111,14 +111,14 @@ endif ( )
 # add the library dependencies
 #-------------------------------------------------------------------------------
 
-target_link_libraries ( ccolamd PRIVATE SuiteSparse::suitesparseconfig )
+target_link_libraries ( ccolamd PRIVATE SuiteSparse::SuiteSparseConfig )
 target_include_directories ( ccolamd PUBLIC
-    "$<TARGET_PROPERTY:SuiteSparse::suitesparseconfig,INTERFACE_INCLUDE_DIRECTORIES>" )
+    "$<TARGET_PROPERTY:SuiteSparse::SuiteSparseConfig,INTERFACE_INCLUDE_DIRECTORIES>" )
 if ( NOT NSTATIC )
-    if ( TARGET SuiteSparse::suitesparseconfig_static )
-        target_link_libraries ( ccolamd_static PUBLIC SuiteSparse::suitesparseconfig_static )
+    if ( TARGET SuiteSparse::SuiteSparseConfig_static )
+        target_link_libraries ( ccolamd_static PUBLIC SuiteSparse::SuiteSparseConfig_static )
     else ( )
-        target_link_libraries ( ccolamd_static PUBLIC SuiteSparse::suitesparseconfig )
+        target_link_libraries ( ccolamd_static PUBLIC SuiteSparse::SuiteSparseConfig )
     endif ( )
 endif ( )
 

diff --git a/CHOLMOD/CMakeLists.txt b/CHOLMOD/CMakeLists.txt
@@ -78,7 +78,7 @@ endif ( )
 
 find_package ( SuiteSparse_config 7.1.0
     PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
-if ( NOT TARGET SuiteSparse::suitesparseconfig )
+if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
     find_package ( SuiteSparse_config 7.1.0 REQUIRED )
 endif ( )
 
@@ -357,15 +357,15 @@ endif ( )
 # add the library dependencies
 #-------------------------------------------------------------------------------
 
-# suitesparseconfig:
-target_link_libraries ( cholmod PRIVATE SuiteSparse::suitesparseconfig )
+# SuiteSparseConfig:
+target_link_libraries ( cholmod PRIVATE SuiteSparse::SuiteSparseConfig )
 target_include_directories ( cholmod PUBLIC
-    "$<TARGET_PROPERTY:SuiteSparse::suitesparseconfig,INTERFACE_INCLUDE_DIRECTORIES>" )
+    "$<TARGET_PROPERTY:SuiteSparse::SuiteSparseConfig,INTERFACE_INCLUDE_DIRECTORIES>" )
 if ( NOT NSTATIC )
-    if ( TARGET SuiteSparse::suitesparseconfig_static )
-        target_link_libraries ( cholmod_static PUBLIC SuiteSparse::suitesparseconfig_static )
+    if ( TARGET SuiteSparse::SuiteSparseConfig_static )
+        target_link_libraries ( cholmod_static PUBLIC SuiteSparse::SuiteSparseConfig_static )
     else ( )
-        target_link_libraries ( cholmod_static PUBLIC SuiteSparse::suitesparseconfig )
+        target_link_libraries ( cholmod_static PUBLIC SuiteSparse::SuiteSparseConfig )
     endif ( )
 endif ( )
 
@@ -539,8 +539,8 @@ if ( DEMO )
     endif ( )
 
     # Libraries required for Demo programs
-    target_link_libraries ( cholmod_demo   PUBLIC cholmod ${CHOLMOD_CUDA} SuiteSparse::suitesparseconfig )
-    target_link_libraries ( cholmod_l_demo PUBLIC cholmod ${CHOLMOD_CUDA} SuiteSparse::suitesparseconfig )
+    target_link_libraries ( cholmod_demo   PUBLIC cholmod ${CHOLMOD_CUDA} SuiteSparse::SuiteSparseConfig )
+    target_link_libraries ( cholmod_l_demo PUBLIC cholmod ${CHOLMOD_CUDA} SuiteSparse::SuiteSparseConfig )
     target_link_libraries ( cholmod_simple PUBLIC cholmod ${CHOLMOD_CUDA} )
 
 else ( )

diff --git a/COLAMD/CMakeLists.txt b/COLAMD/CMakeLists.txt
@@ -44,7 +44,7 @@ project ( colamd
 
 find_package ( SuiteSparse_config 7.1.0
     PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
-if ( NOT TARGET SuiteSparse::suitesparseconfig )
+if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
     find_package ( SuiteSparse_config 7.1.0 REQUIRED )
 endif ( )
 
@@ -111,14 +111,14 @@ endif ( )
 # add the library dependencies
 #-------------------------------------------------------------------------------
 
-target_link_libraries ( colamd PRIVATE SuiteSparse::suitesparseconfig )
+target_link_libraries ( colamd PRIVATE SuiteSparse::SuiteSparseConfig )
 target_include_directories ( colamd PUBLIC
-    "$<TARGET_PROPERTY:SuiteSparse::suitesparseconfig,INTERFACE_INCLUDE_DIRECTORIES>" )
+    "$<TARGET_PROPERTY:SuiteSparse::SuiteSparseConfig,INTERFACE_INCLUDE_DIRECTORIES>" )
 if ( NOT NSTATIC )
-    if ( TARGET SuiteSparse::suitesparseconfig_static )
-        target_link_libraries ( colamd_static PUBLIC SuiteSparse::suitesparseconfig_static )
+    if ( TARGET SuiteSparse::SuiteSparseConfig_static )
+        target_link_libraries ( colamd_static PUBLIC SuiteSparse::SuiteSparseConfig_static )
     else ( )
-        target_link_libraries ( colamd_static PUBLIC SuiteSparse::suitesparseconfig )
+        target_link_libraries ( colamd_static PUBLIC SuiteSparse::SuiteSparseConfig )
     endif ( )
 endif ( )
 

diff --git a/CXSparse/CMakeLists.txt b/CXSparse/CMakeLists.txt
@@ -65,7 +65,7 @@ project ( cxsparse
 
 find_package ( SuiteSparse_config 7.1.0
     PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
-if ( NOT TARGET SuiteSparse::suitesparseconfig )
+if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
     find_package ( SuiteSparse_config 7.1.0 REQUIRED )
 endif ( )
 
@@ -144,14 +144,14 @@ endif ( )
 # add the library dependencies
 #-------------------------------------------------------------------------------
 
-target_link_libraries ( cxsparse PRIVATE SuiteSparse::suitesparseconfig )
+target_link_libraries ( cxsparse PRIVATE SuiteSparse::SuiteSparseConfig )
 target_include_directories ( cxsparse PUBLIC
-    "$<TARGET_PROPERTY:SuiteSparse::suitesparseconfig,INTERFACE_INCLUDE_DIRECTORIES>" )
+    "$<TARGET_PROPERTY:SuiteSparse::SuiteSparseConfig,INTERFACE_INCLUDE_DIRECTORIES>" )
 if ( NOT NSTATIC )
-    if ( TARGET SuiteSparse::suitesparseconfig_static )
-        target_link_libraries ( cxsparse_static PUBLIC SuiteSparse::suitesparseconfig_static )
+    if ( TARGET SuiteSparse::SuiteSparseConfig_static )
+        target_link_libraries ( cxsparse_static PUBLIC SuiteSparse::SuiteSparseConfig_static )
     else ( )
-        target_link_libraries ( cxsparse_static PUBLIC SuiteSparse::suitesparseconfig )
+        target_link_libraries ( cxsparse_static PUBLIC SuiteSparse::SuiteSparseConfig )
     endif ( )
 endif ( )
 

diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt
@@ -396,15 +396,15 @@ else ( )
     target_link_libraries ( my_cxx_static PUBLIC spqr )
 endif ( )
 
-# suitesparseconfig:
-target_link_libraries ( my PRIVATE SuiteSparse::suitesparseconfig )
-target_link_libraries ( my_cxx PRIVATE SuiteSparse::suitesparseconfig )
-if ( TARGET SuiteSparse::suitesparseconfig_static )
-    target_link_libraries ( my_static PUBLIC SuiteSparse::suitesparseconfig_static )
-    target_link_libraries ( my_cxx_static PUBLIC SuiteSparse::suitesparseconfig_static )
+# SuiteSparseConfig:
+target_link_libraries ( my PRIVATE SuiteSparse::SuiteSparseConfig )
+target_link_libraries ( my_cxx PRIVATE SuiteSparse::SuiteSparseConfig )
+if ( TARGET SuiteSparse::SuiteSparseConfig_static )
+    target_link_libraries ( my_static PUBLIC SuiteSparse::SuiteSparseConfig_static )
+    target_link_libraries ( my_cxx_static PUBLIC SuiteSparse::SuiteSparseConfig_static )
 else ( )
-    target_link_libraries ( my_static PUBLIC SuiteSparse::suitesparseconfig )
-    target_link_libraries ( my_cxx_static PUBLIC SuiteSparse::suitesparseconfig )
+    target_link_libraries ( my_static PUBLIC SuiteSparse::SuiteSparseConfig )
+    target_link_libraries ( my_cxx_static PUBLIC SuiteSparse::SuiteSparseConfig )
 endif ( )
 
 # suitesparse_gpuruntime:

diff --git a/Example/Include/my.h b/Example/Include/my.h
@@ -11,10 +11,10 @@
 // file, since it is constructed from Config/my.h.in by cmake.
 
 // version and date for example user library
-#define MY_DATE "June 16, 2023"
+#define MY_DATE "July FIXME, 2023"
 #define MY_MAJOR_VERSION 1
-#define MY_MINOR_VERSION 2
-#define MY_PATCH_VERSION 5
+#define MY_MINOR_VERSION 3
+#define MY_PATCH_VERSION 0
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/GPUQREngine/CMakeLists.txt b/GPUQREngine/CMakeLists.txt
@@ -57,7 +57,7 @@ endif ( )
 # for the library itself
 find_package ( SuiteSparse_config 7.1.0
     PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
-if ( NOT TARGET SuiteSparse::suitesparseconfig )
+if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
     find_package ( SuiteSparse_config 7.1.0 REQUIRED )
 endif ( )
 
@@ -166,7 +166,7 @@ set_target_properties ( gpuqrengine PROPERTIES
 target_include_directories ( gpuqrengine PRIVATE
     ${CUDAToolkit_INCLUDE_DIRS}
     ${GPUQRENGINE_INCLUDES}
-    $<TARGET_PROPERTY:SuiteSparse::suitesparseconfig,INTERFACE_INCLUDE_DIRECTORIES> )
+    $<TARGET_PROPERTY:SuiteSparse::SuiteSparseConfig,INTERFACE_INCLUDE_DIRECTORIES> )
 
 if ( SUITESPARSE_CUDA )
     target_include_directories ( gpuqrengine PRIVATE
@@ -204,7 +204,7 @@ if ( NOT NSTATIC )
     target_include_directories ( gpuqrengine_static PRIVATE
         ${CUDAToolkit_INCLUDE_DIRS}
         ${GPUQRENGINE_INCLUDES}
-        $<TARGET_PROPERTY:SuiteSparse::suitesparseconfig,INTERFACE_INCLUDE_DIRECTORIES> )
+        $<TARGET_PROPERTY:SuiteSparse::SuiteSparseConfig,INTERFACE_INCLUDE_DIRECTORIES> )
 
     if ( SUITESPARSE_CUDA )
         target_include_directories ( gpuqrengine_static PRIVATE
@@ -283,7 +283,7 @@ if ( DEMO AND DEMO_OK )
     target_link_libraries ( gpuqrengine_demo PUBLIC gpuqrengine
         cholmod amd colamd
         camd ccolamd cholmod_cuda
-        suitesparse_gpuruntime SuiteSparse::suitesparseconfig )
+        suitesparse_gpuruntime SuiteSparse::SuiteSparseConfig )
 
 else ( )
 

diff --git a/GraphBLAS/Config/GB_config.h b/GraphBLAS/Config/GB_config.h
@@ -15,18 +15,18 @@
 
 // GB_C_COMPILER: the C compiler used to compile GraphBLAS:
 #ifndef GB_C_COMPILER
-#define GB_C_COMPILER   "/usr/bin/cc"
+#define GB_C_COMPILER   "C:/msys64/mingw64/bin/cc.exe"
 #endif
 
 // GB_C_FLAGS: the C compiler flags used to compile GraphBLAS.  Used
 // for compiling and linking:
 #ifndef GB_C_FLAGS
-#define GB_C_FLAGS      " -Wundef  -std=c11 -lm -Wno-pragmas  -fexcess-precision=fast  -fcx-limited-range  -fno-math-errno  -fwrapv  -O3 -DNDEBUG -fopenmp  -fPIC "
+#define GB_C_FLAGS      " -Wundef  -std=c11 -lm -Wno-pragmas  -fexcess-precision=fast  -fcx-limited-range  -fno-math-errno  -fwrapv  -O3 -DNDEBUG -fopenmp "
 #endif
 
 // GB_C_LINK_FLAGS: the flags passed to the C compiler for the link phase:
 #ifndef GB_C_LINK_FLAGS
-#define GB_C_LINK_FLAGS " -shared "
+#define GB_C_LINK_FLAGS ""
 #endif
 
 // GB_LIB_PREFIX: library prefix (lib for Linux/Unix/Mac, empty for Windows):
@@ -36,12 +36,12 @@
 
 // GB_LIB_SUFFIX: library suffix (.so for Linux/Unix, .dylib for Mac, etc):
 #ifndef GB_LIB_SUFFIX
-#define GB_LIB_SUFFIX   ".so"
+#define GB_LIB_SUFFIX   ".dll"
 #endif
 
 // GB_OBJ_SUFFIX: object suffix (.o for Linux/Unix/Mac, .obj for Windows):
 #ifndef GB_OBJ_SUFFIX
-#define GB_OBJ_SUFFIX   ".o"
+#define GB_OBJ_SUFFIX   ".obj"
 #endif
 
 // GB_OMP_INC: -I includes for OpenMP, if in use by GraphBLAS:
@@ -57,12 +57,12 @@
 
 // GB_C_LIBRARIES: libraries to link with when using direct compile/link:
 #ifndef GB_C_LIBRARIES
-#define GB_C_LIBRARIES  " -lm -ldl /usr/lib/gcc/x86_64-linux-gnu/9/libgomp.so /usr/lib/x86_64-linux-gnu/libpthread.so"
+#define GB_C_LIBRARIES  " C:/msys64/mingw64/lib/libgomp.dll.a C:/msys64/mingw64/lib/libmingwthrd.a C:/msys64/mingw64/lib/libmingwthrd.a"
 #endif
 
 // GB_CMAKE_LIBRARIES: libraries to link with when using cmake
 #ifndef GB_CMAKE_LIBRARIES
-#define GB_CMAKE_LIBRARIES  "m;dl;/usr/lib/gcc/x86_64-linux-gnu/9/libgomp.so;/usr/lib/x86_64-linux-gnu/libpthread.so"
+#define GB_CMAKE_LIBRARIES  "C:/msys64/mingw64/lib/libgomp.dll.a;C:/msys64/mingw64/lib/libmingwthrd.a;C:/msys64/mingw64/lib/libmingwthrd.a"
 #endif
 
 #endif

diff --git a/KLU/CMakeLists.txt b/KLU/CMakeLists.txt
@@ -45,7 +45,7 @@ project ( klu
 
 find_package ( SuiteSparse_config 7.1.0
     PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
-if ( NOT TARGET SuiteSparse::suitesparseconfig )
+if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
     find_package ( SuiteSparse_config 7.1.0 REQUIRED )
 endif ( )
 find_package ( BTF 2.0.4
@@ -220,13 +220,13 @@ endif ( )
 # add the library dependencies
 #-------------------------------------------------------------------------------
 
-# suitesparseconfig:
-target_link_libraries ( klu PRIVATE SuiteSparse::suitesparseconfig )
+# SuiteSparseConfig:
+target_link_libraries ( klu PRIVATE SuiteSparse::SuiteSparseConfig )
 if ( NOT NSTATIC )
-    if ( TARGET SuiteSparse::suitesparseconfig_static )
-        target_link_libraries ( klu_static PUBLIC SuiteSparse::suitesparseconfig_static )
+    if ( TARGET SuiteSparse::SuiteSparseConfig_static )
+        target_link_libraries ( klu_static PUBLIC SuiteSparse::SuiteSparseConfig_static )
     else ( )
-        target_link_libraries ( klu_static PUBLIC SuiteSparse::suitesparseconfig )
+        target_link_libraries ( klu_static PUBLIC SuiteSparse::SuiteSparseConfig )
     endif ( )
 endif ( )