Skip to content

Commit

Permalink
CMAKE: Make GTest name configurable
Browse files Browse the repository at this point in the history
As part of #334, make the name of the googletest configurable to avoid
issues between SEACAS and Trilinos.
  • Loading branch information
gsjaardema committed Oct 18, 2022
1 parent d04c860 commit d73bdc1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
10 changes: 6 additions & 4 deletions ProjectName.cmake
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# Must set the project name at very beginning before including anything else
SET(PROJECT_NAME Seacas)
set(PROJECT_NAME Seacas)

# Turn on export dependency generation for WrapExteranl package
SET(${PROJECT_NAME}_GENERATE_EXPORT_FILE_DEPENDENCIES_DEFAULT ON)
set(${PROJECT_NAME}_GENERATE_EXPORT_FILE_DEPENDENCIES_DEFAULT ON)

SET(${PROJECT_NAME}_GENERATE_REPO_VERSION_FILE_DEFAULT ON)
set(${PROJECT_NAME}_GENERATE_REPO_VERSION_FILE_DEFAULT ON)

SET(${PROJECT_NAME}_GENERATE_VERSION_DATE_FILES_DEFAULT ON)
set(${PROJECT_NAME}_GENERATE_VERSION_DATE_FILES_DEFAULT ON)

set(SEACAS_GTest_TPL_name "GTest")
4 changes: 2 additions & 2 deletions packages/seacas/libraries/ioss/cmake/Dependencies.cmake
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
if(CMAKE_PROJECT_NAME STREQUAL "Seacas")
TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
LIB_OPTIONAL_PACKAGES SEACASExodus Zoltan
LIB_OPTIONAL_TPLS HDF5 Pamgen CGNS ParMETIS Faodel Cereal DLlib Pthread ADIOS2 Catalyst2 GTest Kokkos DataWarp fmt
LIB_OPTIONAL_TPLS HDF5 Pamgen CGNS ParMETIS Faodel Cereal DLlib Pthread ADIOS2 Catalyst2 ${SEACAS_GTest_TPL_name} Kokkos DataWarp fmt
)
else()
TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
LIB_OPTIONAL_PACKAGES SEACASExodus Pamgen Zoltan Kokkos
LIB_OPTIONAL_TPLS HDF5 CGNS ParMETIS Faodel Cereal DLlib Pthread DataWarp ADIOS2 Catalyst2 GTest
LIB_OPTIONAL_TPLS HDF5 CGNS ParMETIS Faodel Cereal DLlib Pthread DataWarp ADIOS2 Catalyst2 ${SEACAS_GTest_TPL_name}
)
endif()

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
LIB_REQUIRED_PACKAGES SEACASExodus
LIB_OPTIONAL_TPLS GTest
LIB_OPTIONAL_TPLS ${SEACAS_GTest_TPL_name}
)

0 comments on commit d73bdc1

Please sign in to comment.