Skip to content

Commit

Permalink
Merge Pull Request #12372 from trilinos/Trilinos/revert-12362-tribits…
Browse files Browse the repository at this point in the history
…_default_changes

Automatically Merged using Trilinos Pull Request AutoTester
PR Title: b'Revert "Framework: Enable CMAKE_LINK_LIBRARIES_ONLY_TARGETS"'
PR Author: bartlettroscoe
  • Loading branch information
trilinos-autotester authored Oct 7, 2023
2 parents 8dffc1c + 7939a2c commit 04b2897
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
6 changes: 2 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,6 @@ 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 @@ -111,6 +107,8 @@ 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
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ ENDIF()
# LibM not available under MSVC.
IF(NOT MSVC)
# Add libm linking for ceil, floor and such.
add_library(SuiteSparse::m INTERFACE IMPORTED)
set_property(TARGET SuiteSparse::m PROPERTY IMPORTED_LIBNAME "m")
LIST(APPEND IMPORTEDLIBS SuiteSparse::m)
LIST(APPEND IMPORTEDLIBS m)
ENDIF()

TRIBITS_ADD_LIBRARY(
Expand Down
4 changes: 1 addition & 3 deletions packages/zoltan/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -670,9 +670,7 @@ ENDIF()

IF(NOT MSVC)
# Add libm linking for ceil, floor and such.
add_library(Zoltan::m INTERFACE IMPORTED)
set_property(TARGET Zoltan::m PROPERTY IMPORTED_LIBNAME "m")
LIST(APPEND IMPORTEDLIBS Zoltan::m)
LIST(APPEND IMPORTEDLIBS m)
ENDIF()

TRIBITS_ADD_LIBRARY(
Expand Down

0 comments on commit 04b2897

Please sign in to comment.