Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Framework: Enable CMAKE_LINK_LIBRARIES_ONLY_TARGETS #12362

Merged
merged 5 commits into from
Oct 6, 2023
Merged

Framework: Enable CMAKE_LINK_LIBRARIES_ONLY_TARGETS #12362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1959f20
Turn on LINK_LIBRARIES_ONLY_TARGETS
sebrowne Oct 4, 2023
2ee8d89
Move variable prior to TriBITS call
sebrowne Oct 4, 2023
adb1dff
Set value (fix typo)
sebrowne Oct 4, 2023
8c972a7
Properly declare imported 'm' library
sebrowne Oct 5, 2023
81f6955
Move 'libm' target to packages where it is used
sebrowne Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@ SET(${PROJECT_NAME}_EXCLUDE_DISABLED_SUBPACKAGES_FROM_DISTRIBUTION_DEFAULT FALSE

SET(Trilinos_USE_GNUINSTALLDIRS_DEFAULT ON)

SET(Trilinos_MUST_FIND_ALL_TPL_LIBS_DEFAULT TRUE)

SET(CMAKE_LINK_LIBRARIES_ONLY_TARGETS ON)

# Set up C++ language standard selection
include(SetTrilinosCxxStandard)

Expand All @@ -107,8 +111,6 @@ INSTALL_BUILD_STATS_SCRIPTS()
# Install TriBITS so that other projects can use it
include(SetupTribitsInstall)

SET(Trilinos_MUST_FIND_ALL_TPL_LIBS_DEFAULT TRUE)

IF(${PROJECT_NAME}_ENABLE_YouCompleteMe)
INCLUDE(CodeCompletion)
ENDIF()
Expand Down
4 changes: 3 additions & 1 deletion packages/common/auxiliarySoftware/SuiteSparse/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ ENDIF()
# LibM not available under MSVC.
IF(NOT MSVC)
# Add libm linking for ceil, floor and such.
LIST(APPEND IMPORTEDLIBS 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(
Expand Down
4 changes: 3 additions & 1 deletion packages/zoltan/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,9 @@ ENDIF()

IF(NOT MSVC)
# Add libm linking for ceil, floor and such.
LIST(APPEND IMPORTEDLIBS 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(
Expand Down