-
Notifications
You must be signed in to change notification settings - Fork 45
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'github/master' into update-trilinos-3913
- Loading branch information
Showing
39 changed files
with
654 additions
and
16 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
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
72 changes: 72 additions & 0 deletions
72
test/core/ExamplesUnitTests/PkgWithUserErrors/CMakeLists.txt
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 |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| # TRIBITS_PACKAGE() will be called by default | ||
| IF(NOT ${PACKAGE_NAME}_SKIP_TRIBITS_PACKAGE_INIT) | ||
| TRIBITS_PACKAGE(PkgWithUserErrors) | ||
| ENDIF() | ||
|
|
||
| INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) | ||
|
|
||
| # Not added by defult | ||
| IF(${PACKAGE_NAME}_ADD_LIBRARY_BEFORE_POST_PROCESS) | ||
| MESSAGE("building library") | ||
| TRIBITS_ADD_LIBRARY( | ||
| pkgwithusererrors | ||
| HEADERS PkgWithUserErrorsLib.hpp | ||
| SOURCES PkgWithUserErrorsLib.cpp | ||
| ) | ||
| ENDIF() | ||
|
|
||
| # Not added by defult | ||
| IF(${PACKAGE_NAME}_UNPARSED_ARGS_ADD_LIBRARY) | ||
| TRIBITS_ADD_LIBRARY( | ||
| pkgwithusererrors | ||
| this_shouldnt_be_here | ||
| HEADERS PkgWithUserErrorsLib.hpp | ||
| SOURCES PkgWithUserErrorsLib.cpp | ||
| ) | ||
| ENDIF() | ||
|
|
||
| # Not added by defult | ||
| IF(${PACKAGE_NAME}_ADD_EXECUTABLE_BEFORE_POST_PROCESS) | ||
| MESSAGE("building exectuable") | ||
| TRIBITS_ADD_EXECUTABLE( | ||
| usererrorexec | ||
| SOURCES PkgWithUserErrorsEX.cpp | ||
| ) | ||
| ENDIF() | ||
|
|
||
| # Not added by defult | ||
| IF(${PACKAGE_NAME}_UNPARSED_ARGS_ADD_EXECUTABLE) | ||
| MESSAGE("building exectuable") | ||
| TRIBITS_ADD_EXECUTABLE( | ||
| usererrorexec | ||
| misspelled_argument | ||
| SOURCES PkgWithUserErrorsEX.cpp | ||
| SPORCOOS some_file.cpp | ||
| ) | ||
| ENDIF() | ||
|
|
||
| IF(NOT ${PACKAGE_NAME}_SKIP_PACKAGE_TESTS) | ||
| TRIBITS_ADD_TEST_DIRECTORIES(test) | ||
| ENDIF() | ||
|
|
||
| # TRIBITS_PACKAGE_POSTPROCESS() will be called by default | ||
| IF (NOT ${PACKAGE_NAME}_SKIP_PACKAGE_POST_PROCESS) | ||
| TRIBITS_PACKAGE_POSTPROCESS() | ||
| ENDIF() | ||
|
|
||
| # Not added by defult | ||
| IF (${PACKAGE_NAME}_ADD_LIBRARY_AFTER_POST_PROCESS) | ||
| TRIBITS_ADD_LIBRARY( | ||
| pkgwithusererrors2 | ||
| HEADERS PkgWithUserErrorsLib.hpp | ||
| SOURCES PkgWithUserErrorsLib.cpp | ||
| ) | ||
| ENDIF() | ||
|
|
||
| # Not added by defult | ||
| IF(${PACKAGE_NAME}_ADD_EXECUTABLE_AFTER_POST_PROCESS) | ||
| TRIBITS_ADD_EXECUTABLE( | ||
| usererrorexec | ||
| SOURCES PkgWithUserErrorsEX.cpp | ||
| ) | ||
| ENDIF() |
3 changes: 3 additions & 0 deletions
3
test/core/ExamplesUnitTests/PkgWithUserErrors/PackagesList.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 |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| TRIBITS_REPOSITORY_DEFINE_PACKAGES( | ||
| PkgWithUserErrors . PT | ||
| ) |
Oops, something went wrong.