Move 'libm' target to packages where it is used

Keep the top-level CMakeLists.txt cleaner, and keep the imported libraries where they are used to make the packages more separable. User Support Ticket(s) or Story Referenced: TRILFRAME-601
trilinos · Oct 5, 2023 · 81f6955 · 81f6955
1 parent 8c972a7
commit 81f6955
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -97,9 +97,6 @@ SET(Trilinos_MUST_FIND_ALL_TPL_LIBS_DEFAULT TRUE)
 
 SET(CMAKE_LINK_LIBRARIES_ONLY_TARGETS ON)
 
-add_library(toolchain::m INTERFACE IMPORTED)
-set_property(TARGET toolchain::m PROPERTY IMPORTED_LIBNAME "m")
-
 # Set up C++ language standard selection
 include(SetTrilinosCxxStandard)
 

diff --git a/packages/common/auxiliarySoftware/SuiteSparse/src/CMakeLists.txt b/packages/common/auxiliarySoftware/SuiteSparse/src/CMakeLists.txt
@@ -77,7 +77,9 @@ ENDIF()
 # LibM not available under MSVC.
 IF(NOT MSVC)
   # Add libm linking for ceil, floor and such.
-  LIST(APPEND IMPORTEDLIBS toolchain::m)
+  add_library(SuiteSparse::m INTERFACE IMPORTED)
+  set_property(TARGET SuiteSparse::m PROPERTY IMPORTED_LIBNAME "m")
+  LIST(APPEND IMPORTEDLIBS SuiteSparse::m)
 ENDIF()
 
 TRIBITS_ADD_LIBRARY(

diff --git a/packages/zoltan/src/CMakeLists.txt b/packages/zoltan/src/CMakeLists.txt
@@ -670,7 +670,9 @@ ENDIF()
 
 IF(NOT MSVC)
   # Add libm linking for ceil, floor and such.
-  LIST(APPEND IMPORTEDLIBS toolchain::m)
+  add_library(Zoltan::m INTERFACE IMPORTED)
+  set_property(TARGET Zoltan::m PROPERTY IMPORTED_LIBNAME "m")
+  LIST(APPEND IMPORTEDLIBS Zoltan::m)
 ENDIF()
 
 TRIBITS_ADD_LIBRARY(