From a4a78f8f409d5561acaded85938e165aa6d3d830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=BCtzel?= Date: Tue, 7 Nov 2023 17:36:11 +0100 Subject: [PATCH] Install public headers also with static libraries. Also remove VERSION and SOVERSION from static library properties because they are ignored for them anyway. --- AMD/CMakeLists.txt | 6 +++--- BTF/CMakeLists.txt | 8 ++++---- CAMD/CMakeLists.txt | 6 +++--- CCOLAMD/CMakeLists.txt | 6 +++--- CHOLMOD/CMakeLists.txt | 6 +++--- CHOLMOD/GPU/CMakeLists.txt | 7 +++---- COLAMD/CMakeLists.txt | 6 +++--- CSparse/CMakeLists.txt | 3 +-- CXSparse/CMakeLists.txt | 6 +++--- GraphBLAS/CMakeLists.txt | 8 ++++---- KLU/CMakeLists.txt | 12 ++++++------ LAGraph/experimental/CMakeLists.txt | 5 ++--- LAGraph/src/CMakeLists.txt | 5 ++--- LDL/CMakeLists.txt | 6 +++--- Mongoose/CMakeLists.txt | 19 ++++++------------- ParU/CMakeLists.txt | 2 -- RBio/CMakeLists.txt | 6 +++--- SPEX/CMakeLists.txt | 6 +++--- SPQR/CMakeLists.txt | 4 +--- SPQR/GPUQREngine/CMakeLists.txt | 6 +++--- SPQR/GPURuntime/CMakeLists.txt | 6 +++--- SPQR/SPQRGPU/CMakeLists.txt | 4 +--- SuiteSparse_config/CMakeLists.txt | 6 +++--- UMFPACK/CMakeLists.txt | 6 +++--- 24 files changed, 69 insertions(+), 86 deletions(-) diff --git a/AMD/CMakeLists.txt b/AMD/CMakeLists.txt index 4c3dbd966b..4cc7567b4d 100644 --- a/AMD/CMakeLists.txt +++ b/AMD/CMakeLists.txt @@ -102,11 +102,10 @@ target_include_directories ( AMD if ( NOT NSTATIC ) add_library ( AMD_static STATIC ${AMD_SOURCES} ) set_target_properties ( AMD_static PROPERTIES - VERSION ${AMD_VERSION_MAJOR}.${AMD_VERSION_MINOR}.${AMD_VERSION_SUB} C_STANDARD 11 C_STANDARD_REQUIRED ON OUTPUT_NAME amd - SOVERSION ${AMD_VERSION_MAJOR} ) + PUBLIC_HEADER "Include/amd.h" ) if ( MSVC ) set_target_properties ( AMD_static PROPERTIES @@ -159,7 +158,8 @@ install ( TARGETS AMD if ( NOT NSTATIC ) install ( TARGETS AMD_static EXPORT AMDTargets - ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} ) + ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} + PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} ) endif ( ) # create (temporary) export target file during build diff --git a/BTF/CMakeLists.txt b/BTF/CMakeLists.txt index 633270dcbf..ec82bed928 100644 --- a/BTF/CMakeLists.txt +++ b/BTF/CMakeLists.txt @@ -78,7 +78,7 @@ set_target_properties ( BTF PROPERTIES C_STANDARD_REQUIRED ON OUTPUT_NAME btf SOVERSION ${BTF_VERSION_MAJOR} - PUBLIC_HEADER "Include/btf.h" + PUBLIC_HEADER "Include/btf.h" WINDOWS_EXPORT_ALL_SYMBOLS ON) target_include_directories ( BTF @@ -93,11 +93,10 @@ if ( NOT NSTATIC ) add_library ( BTF_static STATIC ${BTF_SOURCES} ) set_target_properties ( BTF_static PROPERTIES - VERSION ${BTF_VERSION_MAJOR}.${BTF_VERSION_MINOR}.${BTF_VERSION_SUB} C_STANDARD 11 C_STANDARD_REQUIRED ON OUTPUT_NAME btf - SOVERSION ${BTF_VERSION_MAJOR} ) + PUBLIC_HEADER "Include/btf.h" ) if ( MSVC ) set_target_properties ( BTF_static PROPERTIES @@ -146,7 +145,8 @@ install ( TARGETS BTF if ( NOT NSTATIC ) install ( TARGETS BTF_static EXPORT BTFTargets - ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} ) + ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} + PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} ) endif ( ) # create (temporary) export target file during build diff --git a/CAMD/CMakeLists.txt b/CAMD/CMakeLists.txt index 1a5c60a3a9..d2ee4015bf 100644 --- a/CAMD/CMakeLists.txt +++ b/CAMD/CMakeLists.txt @@ -96,11 +96,10 @@ if ( NOT NSTATIC ) add_library ( CAMD_static STATIC ${CAMD_SOURCES} ) set_target_properties ( CAMD_static PROPERTIES - VERSION ${CAMD_VERSION_MAJOR}.${CAMD_VERSION_MINOR}.${CAMD_VERSION_SUB} C_STANDARD 11 C_STANDARD_REQUIRED ON OUTPUT_NAME camd - SOVERSION ${CAMD_VERSION_MAJOR} ) + PUBLIC_HEADER "Include/camd.h" ) if ( MSVC ) set_target_properties ( CAMD_static PROPERTIES @@ -152,7 +151,8 @@ install ( TARGETS CAMD if ( NOT NSTATIC ) install ( TARGETS CAMD_static EXPORT CAMDTargets - ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} ) + ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} + PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} ) endif ( ) # create (temporary) export target file during build diff --git a/CCOLAMD/CMakeLists.txt b/CCOLAMD/CMakeLists.txt index 4bd82db1c1..a23e074e71 100644 --- a/CCOLAMD/CMakeLists.txt +++ b/CCOLAMD/CMakeLists.txt @@ -93,11 +93,10 @@ if ( NOT NSTATIC ) add_library ( CCOLAMD_static STATIC ${CCOLAMD_SOURCES} ) set_target_properties ( CCOLAMD_static PROPERTIES - VERSION ${CCOLAMD_VERSION_MAJOR}.${CCOLAMD_VERSION_MINOR}.${CCOLAMD_VERSION_SUB} OUTPUT_NAME ccolamd C_STANDARD 11 C_STANDARD_REQUIRED ON - SOVERSION ${CCOLAMD_VERSION_MAJOR} ) + PUBLIC_HEADER "Include/ccolamd.h" ) if ( MSVC ) set_target_properties ( CCOLAMD_static PROPERTIES @@ -149,7 +148,8 @@ install ( TARGETS CCOLAMD if ( NOT NSTATIC ) install ( TARGETS CCOLAMD_static EXPORT CCOLAMDTargets - ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} ) + ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} + PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} ) endif ( ) # create (temporary) export target file during build diff --git a/CHOLMOD/CMakeLists.txt b/CHOLMOD/CMakeLists.txt index db5c4e5f0d..206525b64f 100644 --- a/CHOLMOD/CMakeLists.txt +++ b/CHOLMOD/CMakeLists.txt @@ -328,11 +328,10 @@ if ( NOT NSTATIC ) add_library ( CHOLMOD_static STATIC ${CHOLMOD_SOURCES} ) set_target_properties ( CHOLMOD_static PROPERTIES - VERSION ${CHOLMOD_VERSION_MAJOR}.${CHOLMOD_VERSION_MINOR}.${CHOLMOD_VERSION_SUB} C_STANDARD 11 C_STANDARD_REQUIRED ON OUTPUT_NAME cholmod - SOVERSION ${CHOLMOD_VERSION_MAJOR} ) + PUBLIC_HEADER "Include/cholmod.h" ) if ( MSVC ) set_target_properties ( CHOLMOD_static PROPERTIES @@ -519,7 +518,8 @@ install ( TARGETS CHOLMOD if ( NOT NSTATIC ) install ( TARGETS CHOLMOD_static EXPORT CHOLMODTargets - ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} ) + ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} + PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} ) endif ( ) # create (temporary) export target file during build diff --git a/CHOLMOD/GPU/CMakeLists.txt b/CHOLMOD/GPU/CMakeLists.txt index ad32d7bcda..1d96129e8c 100644 --- a/CHOLMOD/GPU/CMakeLists.txt +++ b/CHOLMOD/GPU/CMakeLists.txt @@ -45,13 +45,11 @@ if ( NOT NSTATIC ) add_library ( CHOLMOD_CUDA_static STATIC ${CHOLMOD_CUDA_SOURCES} ) set_target_properties ( CHOLMOD_CUDA_static PROPERTIES - VERSION ${CHOLMOD_VERSION_MAJOR}.${CHOLMOD_VERSION_MINOR}.${CHOLMOD_VERSION_SUB} CXX_STANDARD_REQUIRED ON CXX_STANDARD 17 C_STANDARD_REQUIRED ON C_STANDARD 11 - OUTPUT_NAME cholmod_cuda - SOVERSION ${CHOLMOD_VERSION_MAJOR} ) + OUTPUT_NAME cholmod_cuda ) if ( MSVC ) set_target_properties ( CHOLMOD_CUDA_static PROPERTIES @@ -108,7 +106,8 @@ install ( TARGETS CHOLMOD_CUDA if ( NOT NSTATIC ) install ( TARGETS CHOLMOD_CUDA_static EXPORT CHOLMOD_CUDATargets - ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} ) + ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} + PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} ) endif ( ) diff --git a/COLAMD/CMakeLists.txt b/COLAMD/CMakeLists.txt index c2ef219d68..4fb27915c5 100644 --- a/COLAMD/CMakeLists.txt +++ b/COLAMD/CMakeLists.txt @@ -93,11 +93,10 @@ if ( NOT NSTATIC ) add_library ( COLAMD_static STATIC ${COLAMD_SOURCES} ) set_target_properties ( COLAMD_static PROPERTIES - VERSION ${COLAMD_VERSION_MAJOR}.${COLAMD_VERSION_MINOR}.${COLAMD_VERSION_SUB} OUTPUT_NAME colamd C_STANDARD 11 C_STANDARD_REQUIRED ON - SOVERSION ${COLAMD_VERSION_MAJOR} ) + PUBLIC_HEADER "Include/colamd.h" ) if ( MSVC ) set_target_properties ( COLAMD_static PROPERTIES @@ -149,7 +148,8 @@ install ( TARGETS COLAMD if ( NOT NSTATIC ) install ( TARGETS COLAMD_static EXPORT COLAMDTargets - ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} ) + ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} + PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} ) endif ( ) # create (temporary) export target file during build diff --git a/CSparse/CMakeLists.txt b/CSparse/CMakeLists.txt index 8c0e61e508..4ae958a332 100644 --- a/CSparse/CMakeLists.txt +++ b/CSparse/CMakeLists.txt @@ -99,11 +99,10 @@ if ( NOT NSTATIC ) add_library ( csparse_static STATIC ${CSPARSE_SOURCES} ) set_target_properties ( csparse_static PROPERTIES - VERSION ${CSPARSE_VERSION_MAJOR}.${CSPARSE_VERSION_MINOR}.${CSPARSE_VERSION_SUB} OUTPUT_NAME csparse C_STANDARD 11 C_STANDARD_REQUIRED ON - SOVERSION ${CSPARSE_VERSION_MAJOR} ) + PUBLIC_HEADER "Include/cs.h" ) if ( MSVC ) set_target_properties ( csparse_static PROPERTIES diff --git a/CXSparse/CMakeLists.txt b/CXSparse/CMakeLists.txt index 1edcee4ab9..6e008eca34 100644 --- a/CXSparse/CMakeLists.txt +++ b/CXSparse/CMakeLists.txt @@ -126,11 +126,10 @@ if ( NOT NSTATIC ) add_library ( CXSparse_static STATIC ${CXSPARSE_SOURCES} ) set_target_properties ( CXSparse_static PROPERTIES - VERSION ${CXSPARSE_VERSION_MAJOR}.${CXSPARSE_VERSION_MINOR}.${CXSPARSE_VERSION_SUB} OUTPUT_NAME cxsparse C_STANDARD 11 C_STANDARD_REQUIRED ON - SOVERSION ${CXSPARSE_VERSION_MAJOR} ) + PUBLIC_HEADER "Include/cs.h" ) if ( MSVC ) set_target_properties ( CXSparse_static PROPERTIES @@ -182,7 +181,8 @@ install ( TARGETS CXSparse if ( NOT NSTATIC ) install ( TARGETS CXSparse_static EXPORT CXSparseTargets - ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} ) + ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} + PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} ) endif ( ) # create (temporary) export target file during build diff --git a/GraphBLAS/CMakeLists.txt b/GraphBLAS/CMakeLists.txt index c2b1088546..86bd8bdc8e 100644 --- a/GraphBLAS/CMakeLists.txt +++ b/GraphBLAS/CMakeLists.txt @@ -277,11 +277,10 @@ if ( NOT NSTATIC ) add_library ( GraphBLAS_static STATIC ${GRAPHBLAS_SOURCES} ) set_target_properties ( GraphBLAS_static PROPERTIES - VERSION ${GraphBLAS_VERSION_MAJOR}.${GraphBLAS_VERSION_MINOR}.${GraphBLAS_VERSION_SUB} OUTPUT_NAME graphblas - SOVERSION ${GraphBLAS_VERSION_MAJOR} C_STANDARD 11 - C_STANDARD_REQUIRED ON ) + C_STANDARD_REQUIRED ON + PUBLIC_HEADER "Include/GraphBLAS.h" ) if ( MSVC ) set_target_properties ( GraphBLAS_static PROPERTIES @@ -500,7 +499,8 @@ install ( TARGETS GraphBLAS if ( NOT NSTATIC ) install ( TARGETS GraphBLAS_static EXPORT GraphBLASTargets - ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} ) + ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} + PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} ) endif ( ) # create (temporary) export target file during build diff --git a/KLU/CMakeLists.txt b/KLU/CMakeLists.txt index 4f6849159a..0cbca450f4 100644 --- a/KLU/CMakeLists.txt +++ b/KLU/CMakeLists.txt @@ -148,11 +148,10 @@ if ( NOT NSTATIC ) add_library ( KLU_static STATIC ${KLU_SOURCES} ) set_target_properties ( KLU_static PROPERTIES - VERSION ${KLU_VERSION_MAJOR}.${KLU_VERSION_MINOR}.${KLU_VERSION_SUB} C_STANDARD 11 C_STANDARD_REQUIRED ON OUTPUT_NAME klu - SOVERSION ${KLU_VERSION_MAJOR} ) + PUBLIC_HEADER "Include/klu.h" ) if ( MSVC ) set_target_properties ( KLU_static PROPERTIES @@ -191,11 +190,10 @@ if ( NOT NCHOLMOD ) add_library ( KLU_CHOLMOD_static STATIC ${KLU_CHOLMOD_SOURCES} ) set_target_properties ( KLU_CHOLMOD_static PROPERTIES - VERSION ${KLU_VERSION_MAJOR}.${KLU_VERSION_MINOR}.${KLU_VERSION_SUB} C_STANDARD 11 C_STANDARD_REQUIRED ON OUTPUT_NAME klu_cholmod - SOVERSION ${KLU_VERSION_MAJOR} ) + PUBLIC_HEADER "User/klu_cholmod.h" ) if ( MSVC ) set_target_properties ( KLU_CHOLMOD_static PROPERTIES @@ -313,7 +311,8 @@ install ( TARGETS KLU if ( NOT NSTATIC ) install ( TARGETS KLU_static EXPORT KLUTargets - ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} ) + ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} + PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} ) endif ( ) # create (temporary) export target file during build @@ -392,7 +391,8 @@ if ( NOT NCHOLMOD ) if ( NOT NSTATIC ) install ( TARGETS KLU_CHOLMOD_static EXPORT KLU_CHOLMODTargets - ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} ) + ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} + PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} ) endif ( ) # create (temporary) export target file during build diff --git a/LAGraph/experimental/CMakeLists.txt b/LAGraph/experimental/CMakeLists.txt index aa8a378388..87f867a147 100644 --- a/LAGraph/experimental/CMakeLists.txt +++ b/LAGraph/experimental/CMakeLists.txt @@ -48,12 +48,11 @@ target_compile_definitions ( LAGraphX PUBLIC LGX_DLL ) if ( NOT NSTATIC ) add_library ( LAGraphX_static STATIC ${LAGRAPHX_LIB_SOURCES} ) SET_TARGET_PROPERTIES ( LAGraphX_static PROPERTIES - VERSION ${LAGraph_VERSION_MAJOR}.${LAGraph_VERSION_MINOR}.${LAGraph_VERSION_SUB} OUTPUT_NAME lagraphx POSITION_INDEPENDENT_CODE OFF - SOVERSION ${LAGraph_VERSION_MAJOR} C_STANDARD_REQUIRED ON - C_STANDARD 11 ) + C_STANDARD 11 + PUBLIC_HEADER "include/LAGraphX.h" ) if ( MSVC ) set_target_properties ( LAGraphX_static PROPERTIES diff --git a/LAGraph/src/CMakeLists.txt b/LAGraph/src/CMakeLists.txt index 5b785d4a89..c9d0c63a02 100644 --- a/LAGraph/src/CMakeLists.txt +++ b/LAGraph/src/CMakeLists.txt @@ -53,12 +53,11 @@ target_compile_definitions ( LAGraph PUBLIC LG_DLL ) if ( NOT NSTATIC ) add_library ( LAGraph_static STATIC ${LAGRAPH_LIB_SOURCES} ) SET_TARGET_PROPERTIES ( LAGraph_static PROPERTIES - VERSION ${LAGraph_VERSION_MAJOR}.${LAGraph_VERSION_MINOR}.${LAGraph_VERSION_SUB} OUTPUT_NAME lagraph POSITION_INDEPENDENT_CODE OFF - SOVERSION ${LAGraph_VERSION_MAJOR} C_STANDARD_REQUIRED ON - C_STANDARD 11 ) + C_STANDARD 11 + PUBLIC_HEADER "include/LAGraph.h" ) if ( MSVC ) set_target_properties ( LAGraph_static PROPERTIES diff --git a/LDL/CMakeLists.txt b/LDL/CMakeLists.txt index 24b2ed5a66..075d4c61b1 100644 --- a/LDL/CMakeLists.txt +++ b/LDL/CMakeLists.txt @@ -106,11 +106,10 @@ if ( NOT NSTATIC ) add_library ( LDL_static STATIC ${LDL_SOURCES} ) set_target_properties ( LDL_static PROPERTIES - VERSION ${LDL_VERSION_MAJOR}.${LDL_VERSION_MINOR}.${LDL_VERSION_SUB} C_STANDARD 11 C_STANDARD_REQUIRED ON OUTPUT_NAME ldl - SOVERSION ${LDL_VERSION_MAJOR} ) + PUBLIC_HEADER "Include/ldl.h" ) if ( MSVC ) set_target_properties ( LDL_static PROPERTIES @@ -158,7 +157,8 @@ install ( TARGETS LDL if ( NOT NSTATIC ) install ( TARGETS LDL_static EXPORT LDLTargets - ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} ) + ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} + PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} ) endif ( ) # create (temporary) export target file during build diff --git a/Mongoose/CMakeLists.txt b/Mongoose/CMakeLists.txt index b7cfe970a6..2c126e9331 100644 --- a/Mongoose/CMakeLists.txt +++ b/Mongoose/CMakeLists.txt @@ -202,7 +202,8 @@ if ( NOT NSTATIC ) add_library ( Mongoose_static STATIC ${MONGOOSE_LIB_FILES} ) # set_property ( TARGET Mongoose_static PROPERTY POSITION_INDEPENDENT_CODE ON ) set_target_properties ( Mongoose_static PROPERTIES - OUTPUT_NAME mongoose ) + OUTPUT_NAME mongoose + PUBLIC_HEADER "Include/Mongoose.hpp" ) if ( MSVC ) set_target_properties ( Mongoose_static PROPERTIES @@ -224,8 +225,10 @@ endif ( ) add_library ( Mongoose SHARED ${MONGOOSE_LIB_FILES} ) set_property ( TARGET Mongoose PROPERTY POSITION_INDEPENDENT_CODE ON ) set_target_properties ( Mongoose PROPERTIES - OUTPUT_NAME mongoose - WINDOWS_EXPORT_ALL_SYMBOLS ON ) + OUTPUT_NAME mongoose + SOVERSION ${Mongoose_VERSION_MAJOR} + PUBLIC_HEADER "Include/Mongoose.hpp" + WINDOWS_EXPORT_ALL_SYMBOLS ON ) target_include_directories ( Mongoose INTERFACE $ @@ -235,16 +238,6 @@ target_link_libraries ( Mongoose PRIVATE SuiteSparse::SuiteSparseConfig ) target_include_directories ( Mongoose PUBLIC "$" ) -# if(CMAKE_MAJOR_VERSION GREATER 2) -# set_target_properties(Mongoose PROPERTIES VERSION ${PROJECT_VERSION}) -# set_target_properties(Mongoose PROPERTIES SOVERSION ${Mongoose_VERSION_MAJOR}) -# else() - set_target_properties ( Mongoose PROPERTIES - VERSION ${Mongoose_VERSION_MAJOR}.${Mongoose_VERSION_MINOR}.${Mongoose_VERSION_PATCH} - SOVERSION ${Mongoose_VERSION_MAJOR} ) -# endif() - -set_target_properties ( Mongoose PROPERTIES PUBLIC_HEADER Include/Mongoose.hpp ) target_include_directories ( Mongoose PRIVATE . ) #------------------------------------------------------------------------------- diff --git a/ParU/CMakeLists.txt b/ParU/CMakeLists.txt index ff04bd97de..6d36b03bf9 100644 --- a/ParU/CMakeLists.txt +++ b/ParU/CMakeLists.txt @@ -143,11 +143,9 @@ if ( NOT NSTATIC ) add_library ( ParU_static STATIC ${PARU_SOURCES} ) set_target_properties ( ParU_static PROPERTIES - VERSION ${PARU_VERSION_MAJOR}.${PARU_VERSION_MINOR}.${PARU_VERSION_UPDATE} CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON OUTPUT_NAME paru - SOVERSION ${PARU_VERSION_MAJOR} PUBLIC_HEADER "Include/ParU.hpp;Include/ParU_C.h;Include/ParU_definitions.h" WINDOWS_EXPORT_ALL_SYMBOLS ON ) diff --git a/RBio/CMakeLists.txt b/RBio/CMakeLists.txt index b927b23d6e..4c311396eb 100644 --- a/RBio/CMakeLists.txt +++ b/RBio/CMakeLists.txt @@ -93,11 +93,10 @@ if ( NOT NSTATIC ) add_library ( RBio_static STATIC ${RBIO_SOURCES} ) set_target_properties ( RBio_static PROPERTIES - VERSION ${RBIO_VERSION_MAJOR}.${RBIO_VERSION_MINOR}.${RBIO_VERSION_SUB} C_STANDARD 11 C_STANDARD_REQUIRED ON OUTPUT_NAME rbio - SOVERSION ${RBIO_VERSION_MAJOR} ) + PUBLIC_HEADER "Include/RBio.h" ) if ( MSVC ) set_target_properties ( RBio_static PROPERTIES @@ -150,7 +149,8 @@ install ( TARGETS RBio if ( NOT NSTATIC ) install ( TARGETS RBio_static EXPORT RBioTargets - ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} ) + ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} + PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} ) endif ( ) # create (temporary) export target file during build diff --git a/SPEX/CMakeLists.txt b/SPEX/CMakeLists.txt index 116c63556d..d8d8945b7d 100644 --- a/SPEX/CMakeLists.txt +++ b/SPEX/CMakeLists.txt @@ -115,11 +115,10 @@ if ( NOT NSTATIC ) add_library ( SPEX_static STATIC ${SPEX_SOURCES} ) set_target_properties ( SPEX_static PROPERTIES - VERSION ${SPEX_VERSION_MAJOR}.${SPEX_VERSION_MINOR}.${SPEX_VERSION_SUB} C_STANDARD 11 C_STANDARD_REQUIRED ON OUTPUT_NAME spex - SOVERSION ${SPEX_VERSION_MAJOR} ) + PUBLIC_HEADER "Include/SPEX.h" ) if ( MSVC ) set_target_properties ( SPEX_static PROPERTIES @@ -207,7 +206,8 @@ install ( TARGETS SPEX if ( NOT NSTATIC ) install ( TARGETS SPEX_static EXPORT SPEXTargets - ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} ) + ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} + PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} ) endif ( ) # create (temporary) export target file during build diff --git a/SPQR/CMakeLists.txt b/SPQR/CMakeLists.txt index 32c395bd89..91e7cec7d6 100644 --- a/SPQR/CMakeLists.txt +++ b/SPQR/CMakeLists.txt @@ -128,13 +128,11 @@ if ( NOT NSTATIC ) add_library ( SPQR_static STATIC ${SPQR_SOURCES} ) set_target_properties ( SPQR_static PROPERTIES - VERSION ${SPQR_VERSION_MAJOR}.${SPQR_VERSION_MINOR}.${SPQR_VERSION_SUB} CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON C_STANDARD 11 C_STANDARD_REQUIRED ON - OUTPUT_NAME spqr - SOVERSION ${SPQR_VERSION_MAJOR} ) + OUTPUT_NAME spqr ) if ( MSVC ) set_target_properties ( SPQR_static PROPERTIES diff --git a/SPQR/GPUQREngine/CMakeLists.txt b/SPQR/GPUQREngine/CMakeLists.txt index 7d7ebac148..93e686178f 100644 --- a/SPQR/GPUQREngine/CMakeLists.txt +++ b/SPQR/GPUQREngine/CMakeLists.txt @@ -119,11 +119,10 @@ if ( NOT NSTATIC ) add_library ( GPUQREngine_static STATIC ${GPUQRENGINE_SOURCES} ) set_target_properties ( GPUQREngine_static PROPERTIES - VERSION ${GPUQRENGINE_VERSION_MAJOR}.${GPUQRENGINE_VERSION_MINOR}.${GPUQRENGINE_VERSION_SUB} CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON OUTPUT_NAME gpuqrengine - SOVERSION ${GPUQRENGINE_VERSION_MAJOR} ) + PUBLIC_HEADER "Include/GPUQREngine.hpp" ) if ( MSVC ) set_target_properties ( GPUQREngine_static PROPERTIES @@ -165,7 +164,8 @@ install ( TARGETS GPUQREngine if ( NOT NSTATIC ) install ( TARGETS GPUQREngine_static EXPORT GPUQREngineTargets - ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} ) + ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} + PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} ) endif ( ) # create (temporary) export target file during build diff --git a/SPQR/GPURuntime/CMakeLists.txt b/SPQR/GPURuntime/CMakeLists.txt index babe4726a7..9bae8056b7 100644 --- a/SPQR/GPURuntime/CMakeLists.txt +++ b/SPQR/GPURuntime/CMakeLists.txt @@ -97,11 +97,10 @@ if ( NOT NSTATIC ) add_library ( GPURuntime_static STATIC ${SUITESPARSE_GPURUNTIME_SOURCES} ) set_target_properties ( GPURuntime_static PROPERTIES - VERSION ${SUITESPARSE_GPURUNTIME_VERSION_MAJOR}.${SUITESPARSE_GPURUNTIME_VERSION_MINOR}.${SUITESPARSE_GPURUNTIME_VERSION_SUB} CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON OUTPUT_NAME suitesparse_gpuruntime - SOVERSION ${SUITESPARSE_GPURUNTIME_VERSION_MAJOR} ) + PUBLIC_HEADER "Include/SuiteSparse_GPURuntime.hpp" ) if ( MSVC ) set_target_properties ( GPURuntime_static PROPERTIES @@ -142,7 +141,8 @@ install ( TARGETS GPURuntime if ( NOT NSTATIC ) install ( TARGETS GPURuntime_static EXPORT SuiteSparse_GPURuntimeTargets - ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} ) + ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} + PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} ) endif ( ) # create (temporary) export target file during build diff --git a/SPQR/SPQRGPU/CMakeLists.txt b/SPQR/SPQRGPU/CMakeLists.txt index d2eeb261ce..d86a35fa77 100644 --- a/SPQR/SPQRGPU/CMakeLists.txt +++ b/SPQR/SPQRGPU/CMakeLists.txt @@ -42,13 +42,11 @@ if ( NOT NSTATIC ) add_library ( SPQR_CUDA_static STATIC ${SPQR_CUDA_SOURCES} ) set_target_properties ( SPQR_CUDA_static PROPERTIES - VERSION ${SPQR_VERSION_MAJOR}.${SPQR_VERSION_MINOR}.${SPQR_VERSION_SUB} CXX_STANDARD_REQUIRED ON CXX_STANDARD 17 C_STANDARD_REQUIRED ON C_STANDARD 11 - OUTPUT_NAME spqr_cuda - SOVERSION ${SPQR_VERSION_MAJOR} ) + OUTPUT_NAME spqr_cuda ) if ( MSVC ) set_target_properties ( SPQR_CUDA_static PROPERTIES diff --git a/SuiteSparse_config/CMakeLists.txt b/SuiteSparse_config/CMakeLists.txt index 287e3499f5..ba72d21e17 100644 --- a/SuiteSparse_config/CMakeLists.txt +++ b/SuiteSparse_config/CMakeLists.txt @@ -107,11 +107,10 @@ if ( NOT NSTATIC ) add_library ( SuiteSparseConfig_static STATIC ${SUITESPARSECONFIG_SOURCES} ) set_target_properties ( SuiteSparseConfig_static PROPERTIES - VERSION ${SUITESPARSE_VERSION_MAJOR}.${SUITESPARSE_VERSION_MINOR}.${SUITESPARSE_VERSION_SUB} C_STANDARD 11 C_STANDARD_REQUIRED ON OUTPUT_NAME suitesparseconfig - SOVERSION ${SUITESPARSE_VERSION_MAJOR} ) + PUBLIC_HEADER "SuiteSparse_config.h" ) if ( MSVC ) set_target_properties ( SuiteSparseConfig_static PROPERTIES @@ -179,7 +178,8 @@ install ( FILES if ( NOT NSTATIC ) install ( TARGETS SuiteSparseConfig_static EXPORT SuiteSparse_configTargets - ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} ) + ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} + PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} ) endif ( ) # create (temporary) export target file during build diff --git a/UMFPACK/CMakeLists.txt b/UMFPACK/CMakeLists.txt index 46966c5246..bf309c23a0 100644 --- a/UMFPACK/CMakeLists.txt +++ b/UMFPACK/CMakeLists.txt @@ -169,11 +169,10 @@ if ( NOT NSTATIC ) add_library ( UMFPACK_static STATIC ${UMFPACK_SOURCES} ) set_target_properties ( UMFPACK_static PROPERTIES - VERSION ${UMFPACK_VERSION_MAJOR}.${UMFPACK_VERSION_MINOR}.${UMFPACK_VERSION_SUB} C_STANDARD 11 C_STANDARD_REQUIRED ON OUTPUT_NAME umfpack - SOVERSION ${UMFPACK_VERSION_MAJOR} ) + PUBLIC_HEADER "Include/umfpack.h" ) if ( MSVC ) set_target_properties ( UMFPACK_static PROPERTIES @@ -278,7 +277,8 @@ install ( TARGETS UMFPACK if ( NOT NSTATIC ) install ( TARGETS UMFPACK_static EXPORT UMFPACKTargets - ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} ) + ARCHIVE DESTINATION ${SUITESPARSE_LIBDIR} + PUBLIC_HEADER DESTINATION ${SUITESPARSE_INCLUDEDIR} ) endif ( ) # create (temporary) export target file during build