-
Notifications
You must be signed in to change notification settings - Fork 80
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
As part of #334, make the name of the googletest configurable to avoid issues between SEACAS and Trilinos.
- Loading branch information
1 parent
d04c860
commit d73bdc1
Showing
3 changed files
with
9 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
packages/seacas/libraries/ioss/src/unit_tests/cmake/Dependencies.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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} | ||
) |