Skip to content

Commit

Permalink
Merge pull request #853 from mmuetzel/cmake
Browse files Browse the repository at this point in the history
Explicitly select linker for some mixed language libraries.
  • Loading branch information
DrTimothyAldenDavis authored Aug 1, 2024
2 parents 0aed651 + 51dcff1 commit ae3cce8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 4 additions & 2 deletions AMD/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ if ( BUILD_SHARED_LIBS )
OUTPUT_NAME amd
SOVERSION ${AMD_VERSION_MAJOR}
PUBLIC_HEADER "Include/amd.h"
WINDOWS_EXPORT_ALL_SYMBOLS ON )
WINDOWS_EXPORT_ALL_SYMBOLS ON
LINKER_LANGUAGE C )

if ( ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.25" )
set_target_properties ( AMD PROPERTIES EXPORT_NO_SYSTEM ON )
Expand All @@ -111,7 +112,8 @@ if ( BUILD_STATIC_LIBS )
C_STANDARD 11
C_STANDARD_REQUIRED ON
OUTPUT_NAME amd
PUBLIC_HEADER "Include/amd.h" )
PUBLIC_HEADER "Include/amd.h"
LINKER_LANGUAGE C )

if ( MSVC OR ("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC") )
set_target_properties ( AMD_static PROPERTIES
Expand Down
6 changes: 4 additions & 2 deletions CHOLMOD/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,8 @@ if ( BUILD_SHARED_LIBS )
OUTPUT_NAME cholmod
SOVERSION ${CHOLMOD_VERSION_MAJOR}
PUBLIC_HEADER "Include/cholmod.h"
WINDOWS_EXPORT_ALL_SYMBOLS ON )
WINDOWS_EXPORT_ALL_SYMBOLS ON
LINKER_LANGUAGE C )

if ( CHOLMOD_HAS_CUDA )
set_target_properties ( CHOLMOD PROPERTIES CUDA_SEPARABLE_COMPILATION ON )
Expand All @@ -410,7 +411,8 @@ if ( BUILD_STATIC_LIBS )
C_STANDARD 11
C_STANDARD_REQUIRED ON
OUTPUT_NAME cholmod
PUBLIC_HEADER "Include/cholmod.h" )
PUBLIC_HEADER "Include/cholmod.h"
LINKER_LANGUAGE C )

if ( MSVC OR ("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC") )
set_target_properties ( CHOLMOD_static PROPERTIES
Expand Down

0 comments on commit ae3cce8

Please sign in to comment.