diff --git a/packages/rol/CMakeLists.txt b/packages/rol/CMakeLists.txt index c2bc685732ed..7e816db1151d 100644 --- a/packages/rol/CMakeLists.txt +++ b/packages/rol/CMakeLists.txt @@ -1,6 +1,4 @@ -INCLUDE(TribitsPackageMacros) -INCLUDE(TribitsAddOptionAndDefine) # # A) Define the package diff --git a/packages/rol/adapters/arrayfire/src/CMakeLists.txt b/packages/rol/adapters/arrayfire/src/CMakeLists.txt index a899870aa58e..2c6b4b045a5c 100644 --- a/packages/rol/adapters/arrayfire/src/CMakeLists.txt +++ b/packages/rol/adapters/arrayfire/src/CMakeLists.txt @@ -1,5 +1,4 @@ -INCLUDE(TribitsLibraryMacros) # # A) Package-specific configuration options diff --git a/packages/rol/adapters/arrayfire/test/CMakeLists.txt b/packages/rol/adapters/arrayfire/test/CMakeLists.txt index 28753ec551ae..a1faddbd14ba 100644 --- a/packages/rol/adapters/arrayfire/test/CMakeLists.txt +++ b/packages/rol/adapters/arrayfire/test/CMakeLists.txt @@ -1,3 +1,2 @@ -INCLUDE(TribitsAddExecutableAndTest) ADD_SUBDIRECTORY(vector) diff --git a/packages/rol/adapters/arrayfire/test/vector/CMakeLists.txt b/packages/rol/adapters/arrayfire/test/vector/CMakeLists.txt index 0d7b5ffdac0f..056f426cde9e 100644 --- a/packages/rol/adapters/arrayfire/test/vector/CMakeLists.txt +++ b/packages/rol/adapters/arrayfire/test/vector/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) IF(ROL_ENABLE_ArrayFireCPU) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/rol/adapters/belos/src/CMakeLists.txt b/packages/rol/adapters/belos/src/CMakeLists.txt index 05554afa7916..109f28e0c0c3 100644 --- a/packages/rol/adapters/belos/src/CMakeLists.txt +++ b/packages/rol/adapters/belos/src/CMakeLists.txt @@ -1,5 +1,4 @@ -INCLUDE(TribitsLibraryMacros) # # A) Package-specific configuration options diff --git a/packages/rol/adapters/belos/test/CMakeLists.txt b/packages/rol/adapters/belos/test/CMakeLists.txt index 28753ec551ae..a1faddbd14ba 100644 --- a/packages/rol/adapters/belos/test/CMakeLists.txt +++ b/packages/rol/adapters/belos/test/CMakeLists.txt @@ -1,3 +1,2 @@ -INCLUDE(TribitsAddExecutableAndTest) ADD_SUBDIRECTORY(vector) diff --git a/packages/rol/adapters/belos/test/vector/CMakeLists.txt b/packages/rol/adapters/belos/test/vector/CMakeLists.txt index 7b8578e2e89d..c093882972be 100644 --- a/packages/rol/adapters/belos/test/vector/CMakeLists.txt +++ b/packages/rol/adapters/belos/test/vector/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) IF(${PROJECT_NAME}_ENABLE_Belos) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/rol/adapters/epetra/src/CMakeLists.txt b/packages/rol/adapters/epetra/src/CMakeLists.txt index 016e5edab9c6..f2b329baa8fd 100644 --- a/packages/rol/adapters/epetra/src/CMakeLists.txt +++ b/packages/rol/adapters/epetra/src/CMakeLists.txt @@ -1,5 +1,4 @@ -INCLUDE(TribitsLibraryMacros) # # A) Package-specific configuration options diff --git a/packages/rol/adapters/epetra/test/CMakeLists.txt b/packages/rol/adapters/epetra/test/CMakeLists.txt index 0e7841dc171f..779c3ad5a50c 100644 --- a/packages/rol/adapters/epetra/test/CMakeLists.txt +++ b/packages/rol/adapters/epetra/test/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) ADD_SUBDIRECTORY(vector) ADD_SUBDIRECTORY(sol) diff --git a/packages/rol/adapters/epetra/test/sol/CMakeLists.txt b/packages/rol/adapters/epetra/test/sol/CMakeLists.txt index d5e5d19d3bdf..a5eaec5cd409 100644 --- a/packages/rol/adapters/epetra/test/sol/CMakeLists.txt +++ b/packages/rol/adapters/epetra/test/sol/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) IF(${PROJECT_NAME}_ENABLE_Epetra) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/rol/adapters/epetra/test/vector/CMakeLists.txt b/packages/rol/adapters/epetra/test/vector/CMakeLists.txt index e4b174a5a353..46ccfa47569a 100644 --- a/packages/rol/adapters/epetra/test/vector/CMakeLists.txt +++ b/packages/rol/adapters/epetra/test/vector/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) IF(${PROJECT_NAME}_ENABLE_Epetra) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/rol/adapters/sacado/src/CMakeLists.txt b/packages/rol/adapters/sacado/src/CMakeLists.txt index 73661852edeb..1ac1a198e489 100644 --- a/packages/rol/adapters/sacado/src/CMakeLists.txt +++ b/packages/rol/adapters/sacado/src/CMakeLists.txt @@ -1,5 +1,4 @@ -INCLUDE(TribitsLibraryMacros) # # A) Package-specific configuration options diff --git a/packages/rol/adapters/thyra/src/CMakeLists.txt b/packages/rol/adapters/thyra/src/CMakeLists.txt index 32172f2b392f..725cad810f54 100644 --- a/packages/rol/adapters/thyra/src/CMakeLists.txt +++ b/packages/rol/adapters/thyra/src/CMakeLists.txt @@ -1,5 +1,4 @@ -INCLUDE(TribitsLibraryMacros) # # A) Package-specific configuration options diff --git a/packages/rol/adapters/thyra/test/CMakeLists.txt b/packages/rol/adapters/thyra/test/CMakeLists.txt index 28753ec551ae..a1faddbd14ba 100644 --- a/packages/rol/adapters/thyra/test/CMakeLists.txt +++ b/packages/rol/adapters/thyra/test/CMakeLists.txt @@ -1,3 +1,2 @@ -INCLUDE(TribitsAddExecutableAndTest) ADD_SUBDIRECTORY(vector) diff --git a/packages/rol/adapters/thyra/test/vector/CMakeLists.txt b/packages/rol/adapters/thyra/test/vector/CMakeLists.txt index c64647c0f564..d3888b4bfe10 100644 --- a/packages/rol/adapters/thyra/test/vector/CMakeLists.txt +++ b/packages/rol/adapters/thyra/test/vector/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) IF(${PROJECT_NAME}_ENABLE_Thyra) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/rol/adapters/tpetra/src/CMakeLists.txt b/packages/rol/adapters/tpetra/src/CMakeLists.txt index b417b95075a0..13676819ad3b 100644 --- a/packages/rol/adapters/tpetra/src/CMakeLists.txt +++ b/packages/rol/adapters/tpetra/src/CMakeLists.txt @@ -1,5 +1,4 @@ -INCLUDE(TribitsLibraryMacros) # # A) Package-specific configuration options diff --git a/packages/rol/adapters/tpetra/test/CMakeLists.txt b/packages/rol/adapters/tpetra/test/CMakeLists.txt index 796828b813fc..87d8e0dd6f1a 100644 --- a/packages/rol/adapters/tpetra/test/CMakeLists.txt +++ b/packages/rol/adapters/tpetra/test/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) ADD_SUBDIRECTORY(vector) ADD_SUBDIRECTORY(function) diff --git a/packages/rol/adapters/tpetra/test/function/CMakeLists.txt b/packages/rol/adapters/tpetra/test/function/CMakeLists.txt index 52b8bf490c10..5834da68bb28 100644 --- a/packages/rol/adapters/tpetra/test/function/CMakeLists.txt +++ b/packages/rol/adapters/tpetra/test/function/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) IF(${PROJECT_NAME}_ENABLE_Tpetra) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/rol/adapters/tpetra/test/sol/CMakeLists.txt b/packages/rol/adapters/tpetra/test/sol/CMakeLists.txt index 2c13a44497de..68545e38d53a 100644 --- a/packages/rol/adapters/tpetra/test/sol/CMakeLists.txt +++ b/packages/rol/adapters/tpetra/test/sol/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) IF(${PROJECT_NAME}_ENABLE_Tpetra) diff --git a/packages/rol/adapters/tpetra/test/vector/CMakeLists.txt b/packages/rol/adapters/tpetra/test/vector/CMakeLists.txt index d478417050a1..cc287c50076f 100644 --- a/packages/rol/adapters/tpetra/test/vector/CMakeLists.txt +++ b/packages/rol/adapters/tpetra/test/vector/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) IF(${PROJECT_NAME}_ENABLE_Tpetra) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/rol/adapters/trikota/src/CMakeLists.txt b/packages/rol/adapters/trikota/src/CMakeLists.txt index 282dd019d1d3..37d3c0e03742 100644 --- a/packages/rol/adapters/trikota/src/CMakeLists.txt +++ b/packages/rol/adapters/trikota/src/CMakeLists.txt @@ -1,5 +1,4 @@ -INCLUDE(TribitsLibraryMacros) # # A) Package-specific configuration options diff --git a/packages/rol/adapters/trikota/test/CMakeLists.txt b/packages/rol/adapters/trikota/test/CMakeLists.txt index 30683614fd63..4b25ca31056f 100644 --- a/packages/rol/adapters/trikota/test/CMakeLists.txt +++ b/packages/rol/adapters/trikota/test/CMakeLists.txt @@ -1,3 +1,2 @@ -INCLUDE(TribitsAddExecutableAndTest) ADD_SUBDIRECTORY(sol) diff --git a/packages/rol/adapters/trikota/test/sol/CMakeLists.txt b/packages/rol/adapters/trikota/test/sol/CMakeLists.txt index 4313eca8cb62..ee001cae29b8 100644 --- a/packages/rol/adapters/trikota/test/sol/CMakeLists.txt +++ b/packages/rol/adapters/trikota/test/sol/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) IF(${PROJECT_NAME}_ENABLE_TriKota) diff --git a/packages/rol/example/PDE-OPT/TEST/CMakeLists.txt b/packages/rol/example/PDE-OPT/TEST/CMakeLists.txt index b07d25e3ab62..a1025ba658e3 100644 --- a/packages/rol/example/PDE-OPT/TEST/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/TEST/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Epetra ) diff --git a/packages/rol/example/PDE-OPT/adv-diff-react/CMakeLists.txt b/packages/rol/example/PDE-OPT/adv-diff-react/CMakeLists.txt index 051037d00ffb..5748247cf6e9 100644 --- a/packages/rol/example/PDE-OPT/adv-diff-react/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/adv-diff-react/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Epetra AND diff --git a/packages/rol/example/PDE-OPT/elasticity/CMakeLists.txt b/packages/rol/example/PDE-OPT/elasticity/CMakeLists.txt index e1d79030b22e..85872d636f45 100644 --- a/packages/rol/example/PDE-OPT/elasticity/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/elasticity/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Epetra AND diff --git a/packages/rol/example/PDE-OPT/poisson/CMakeLists.txt b/packages/rol/example/PDE-OPT/poisson/CMakeLists.txt index 424c6d6a5c32..cee0be8a0bb1 100644 --- a/packages/rol/example/PDE-OPT/poisson/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/poisson/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Epetra AND diff --git a/packages/rol/example/PDE-OPT/stefan-boltzmann/CMakeLists.txt b/packages/rol/example/PDE-OPT/stefan-boltzmann/CMakeLists.txt index 8f7f1cdcabef..16e83a8bc05e 100644 --- a/packages/rol/example/PDE-OPT/stefan-boltzmann/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/stefan-boltzmann/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) IF(${PROJECT_NAME}_ENABLE_Intrepid AND ${PROJECT_NAME}_ENABLE_Epetra AND diff --git a/packages/rol/example/arrayfire/CMakeLists.txt b/packages/rol/example/arrayfire/CMakeLists.txt index 6423eb6f62fc..92a2bc7c2b7c 100644 --- a/packages/rol/example/arrayfire/CMakeLists.txt +++ b/packages/rol/example/arrayfire/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) IF(${PACKAGE_NAME}_ENABLE_ArrayFireCPU) diff --git a/packages/rol/example/binary-design/CMakeLists.txt b/packages/rol/example/binary-design/CMakeLists.txt index 94a9a62312aa..4eeb07afc9df 100644 --- a/packages/rol/example/binary-design/CMakeLists.txt +++ b/packages/rol/example/binary-design/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/burgers-control/CMakeLists.txt b/packages/rol/example/burgers-control/CMakeLists.txt index e4c2c02be2ba..d40dc71d53aa 100644 --- a/packages/rol/example/burgers-control/CMakeLists.txt +++ b/packages/rol/example/burgers-control/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutable) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/complex/CMakeLists.txt b/packages/rol/example/complex/CMakeLists.txt index f6e6e3be1f20..d961b825257e 100644 --- a/packages/rol/example/complex/CMakeLists.txt +++ b/packages/rol/example/complex/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/diode-circuit-simopt/CMakeLists.txt b/packages/rol/example/diode-circuit-simopt/CMakeLists.txt index 4e89e24b7e67..ef2af0de13f9 100644 --- a/packages/rol/example/diode-circuit-simopt/CMakeLists.txt +++ b/packages/rol/example/diode-circuit-simopt/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutable) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/diode-circuit/CMakeLists.txt b/packages/rol/example/diode-circuit/CMakeLists.txt index e0b325ecfa13..89625ee04510 100644 --- a/packages/rol/example/diode-circuit/CMakeLists.txt +++ b/packages/rol/example/diode-circuit/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutable) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/dual-spaces/rosenbrock-1/CMakeLists.txt b/packages/rol/example/dual-spaces/rosenbrock-1/CMakeLists.txt index 814b1955a8ec..a55542121ea9 100644 --- a/packages/rol/example/dual-spaces/rosenbrock-1/CMakeLists.txt +++ b/packages/rol/example/dual-spaces/rosenbrock-1/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/dual-spaces/simple-eq-constr-1/CMakeLists.txt b/packages/rol/example/dual-spaces/simple-eq-constr-1/CMakeLists.txt index 814b1955a8ec..a55542121ea9 100644 --- a/packages/rol/example/dual-spaces/simple-eq-constr-1/CMakeLists.txt +++ b/packages/rol/example/dual-spaces/simple-eq-constr-1/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/dual-spaces/simple-eq-constr-2/CMakeLists.txt b/packages/rol/example/dual-spaces/simple-eq-constr-2/CMakeLists.txt index 814b1955a8ec..a55542121ea9 100644 --- a/packages/rol/example/dual-spaces/simple-eq-constr-2/CMakeLists.txt +++ b/packages/rol/example/dual-spaces/simple-eq-constr-2/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/gross-pitaevskii/CMakeLists.txt b/packages/rol/example/gross-pitaevskii/CMakeLists.txt index b3948b891e7e..e64c62af03a3 100644 --- a/packages/rol/example/gross-pitaevskii/CMakeLists.txt +++ b/packages/rol/example/gross-pitaevskii/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/rol/example/intrepid/CMakeLists.txt b/packages/rol/example/intrepid/CMakeLists.txt index 21e301fc623a..f9642fb76f41 100644 --- a/packages/rol/example/intrepid/CMakeLists.txt +++ b/packages/rol/example/intrepid/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) IF(${PROJECT_NAME}_ENABLE_IntrepidCore AND ${PROJECT_NAME}_ENABLE_Shards AND diff --git a/packages/rol/example/json/CMakeLists.txt b/packages/rol/example/json/CMakeLists.txt index 07e922492e1c..4338e209b69a 100644 --- a/packages/rol/example/json/CMakeLists.txt +++ b/packages/rol/example/json/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) # To build this example, add the following to the cmake call in your trilinos build script # -D TPL_ENABLE_JSONCPP=ON \ diff --git a/packages/rol/example/minimax/CMakeLists.txt b/packages/rol/example/minimax/CMakeLists.txt index fb5bc12fb728..4fecc9385bab 100644 --- a/packages/rol/example/minimax/CMakeLists.txt +++ b/packages/rol/example/minimax/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutable) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/parabolic-control/CMakeLists.txt b/packages/rol/example/parabolic-control/CMakeLists.txt index 7822f34c4460..39027ca21f5a 100644 --- a/packages/rol/example/parabolic-control/CMakeLists.txt +++ b/packages/rol/example/parabolic-control/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutable) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/poisson-control/CMakeLists.txt b/packages/rol/example/poisson-control/CMakeLists.txt index 79bf3077c2fe..f4b9b40ce20c 100644 --- a/packages/rol/example/poisson-control/CMakeLists.txt +++ b/packages/rol/example/poisson-control/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutable) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/poisson-inversion/CMakeLists.txt b/packages/rol/example/poisson-inversion/CMakeLists.txt index ffe51193c0cb..6f63d854758a 100644 --- a/packages/rol/example/poisson-inversion/CMakeLists.txt +++ b/packages/rol/example/poisson-inversion/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutable) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/quadratic/CMakeLists.txt b/packages/rol/example/quadratic/CMakeLists.txt index 9f219003371c..bc9d601d4122 100644 --- a/packages/rol/example/quadratic/CMakeLists.txt +++ b/packages/rol/example/quadratic/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/rosenbrock/CMakeLists.txt b/packages/rol/example/rosenbrock/CMakeLists.txt index f86754588529..0fed4ec6d6cc 100644 --- a/packages/rol/example/rosenbrock/CMakeLists.txt +++ b/packages/rol/example/rosenbrock/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/sacado/CMakeLists.txt b/packages/rol/example/sacado/CMakeLists.txt index c5600b15c3d0..6d20798e5907 100644 --- a/packages/rol/example/sacado/CMakeLists.txt +++ b/packages/rol/example/sacado/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/adapters/sacado/src/function) INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}/util/numerics/) diff --git a/packages/rol/example/simple-eq-constr/CMakeLists.txt b/packages/rol/example/simple-eq-constr/CMakeLists.txt index f86754588529..0fed4ec6d6cc 100644 --- a/packages/rol/example/simple-eq-constr/CMakeLists.txt +++ b/packages/rol/example/simple-eq-constr/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/example/topology-optimization/CMakeLists.txt b/packages/rol/example/topology-optimization/CMakeLists.txt index df33fc6a4cc6..a911ddcbd28f 100644 --- a/packages/rol/example/topology-optimization/CMakeLists.txt +++ b/packages/rol/example/topology-optimization/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutable) TRIBITS_ADD_EXECUTABLE( example_01 diff --git a/packages/rol/example/wave-calibration/CMakeLists.txt b/packages/rol/example/wave-calibration/CMakeLists.txt index 851f7b7e680f..f5b6f4068548 100644 --- a/packages/rol/example/wave-calibration/CMakeLists.txt +++ b/packages/rol/example/wave-calibration/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) TRIBITS_ADD_EXECUTABLE_AND_TEST( diff --git a/packages/rol/example/zakharov/CMakeLists.txt b/packages/rol/example/zakharov/CMakeLists.txt index ea556063c129..147c5366742e 100644 --- a/packages/rol/example/zakharov/CMakeLists.txt +++ b/packages/rol/example/zakharov/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) TRIBITS_ADD_EXECUTABLE_AND_TEST( example_01 diff --git a/packages/rol/src/CMakeLists.txt b/packages/rol/src/CMakeLists.txt index 60c9765c902a..d62c8f83d281 100644 --- a/packages/rol/src/CMakeLists.txt +++ b/packages/rol/src/CMakeLists.txt @@ -1,5 +1,4 @@ -INCLUDE(TribitsLibraryMacros) # # A) Package-specific configuration options diff --git a/packages/rol/test/CMakeLists.txt b/packages/rol/test/CMakeLists.txt index a83d2243333b..207243d336c0 100644 --- a/packages/rol/test/CMakeLists.txt +++ b/packages/rol/test/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) ADD_SUBDIRECTORY(function) ADD_SUBDIRECTORY(vector) diff --git a/packages/rol/test/elementwise/CMakeLists.txt b/packages/rol/test/elementwise/CMakeLists.txt index 5438a1717f36..660644f192e0 100644 --- a/packages/rol/test/elementwise/CMakeLists.txt +++ b/packages/rol/test/elementwise/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) TRIBITS_ADD_EXECUTABLE_AND_TEST( StdVector diff --git a/packages/rol/test/function/CMakeLists.txt b/packages/rol/test/function/CMakeLists.txt index 00217236b69d..71660d0f06c6 100644 --- a/packages/rol/test/function/CMakeLists.txt +++ b/packages/rol/test/function/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) TRIBITS_ADD_EXECUTABLE_AND_TEST( DerivativeCheck diff --git a/packages/rol/test/parameters/CMakeLists.txt b/packages/rol/test/parameters/CMakeLists.txt index fad87d1a263a..f18b336bd67b 100644 --- a/packages/rol/test/parameters/CMakeLists.txt +++ b/packages/rol/test/parameters/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) TRIBITS_ADD_EXECUTABLE( ParameterCheck diff --git a/packages/rol/test/sol/CMakeLists.txt b/packages/rol/test/sol/CMakeLists.txt index ed86519f2fab..6fa52545b591 100644 --- a/packages/rol/test/sol/CMakeLists.txt +++ b/packages/rol/test/sol/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) TRIBITS_ADD_EXECUTABLE_AND_TEST( solInterface diff --git a/packages/rol/test/step/CMakeLists.txt b/packages/rol/test/step/CMakeLists.txt index 89de9a635e4c..b28a391a0fdf 100644 --- a/packages/rol/test/step/CMakeLists.txt +++ b/packages/rol/test/step/CMakeLists.txt @@ -1,5 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) -INCLUDE(TribitsCopyFilesToBinaryDir) TRIBITS_ADD_EXECUTABLE_AND_TEST( LineSearch diff --git a/packages/rol/test/step/krylov/CMakeLists.txt b/packages/rol/test/step/krylov/CMakeLists.txt index 1bd4d09456e5..13f90d5e5978 100644 --- a/packages/rol/test/step/krylov/CMakeLists.txt +++ b/packages/rol/test/step/krylov/CMakeLists.txt @@ -1,5 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) -INCLUDE(TribitsCopyFilesToBinaryDir) TRIBITS_ADD_EXECUTABLE_AND_TEST( GMRES diff --git a/packages/rol/test/utils/CMakeLists.txt b/packages/rol/test/utils/CMakeLists.txt index 1a65401601b5..e5417f5177cd 100644 --- a/packages/rol/test/utils/CMakeLists.txt +++ b/packages/rol/test/utils/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) TRIBITS_ADD_EXECUTABLE_AND_TEST( ScalarMinimizationTest01 diff --git a/packages/rol/test/vector/CMakeLists.txt b/packages/rol/test/vector/CMakeLists.txt index 522ed9521c9a..612708ba7f65 100644 --- a/packages/rol/test/vector/CMakeLists.txt +++ b/packages/rol/test/vector/CMakeLists.txt @@ -1,4 +1,3 @@ -INCLUDE(TribitsAddExecutableAndTest) TRIBITS_ADD_EXECUTABLE_AND_TEST( StdVectorInterface