ROL: Remove redundant TriBITS includes (#489)

This removes clutter and speeds up configures. See #489.
trilinos · Jul 12, 2016 · 70511c3 · 70511c3
1 parent 8f491b6
commit 70511c3
Show file tree

Hide file tree

Showing 61 changed files with 0 additions and 64 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,3 @@
-INCLUDE(TribitsAddExecutableAndTest)
 
 TRIBITS_ADD_EXECUTABLE_AND_TEST(
   StdVectorInterface
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,2 @@
		INCLUDE(TribitsAddExecutableAndTest)

		ADD_SUBDIRECTORY(vector)
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@
		INCLUDE(TribitsAddExecutableAndTest)

		IF(${PROJECT_NAME}_ENABLE_Tpetra)

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,2 @@
		INCLUDE(TribitsAddExecutableAndTest)

		ADD_SUBDIRECTORY(sol)
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@
		INCLUDE(TribitsAddExecutableAndTest)

		IF(${PROJECT_NAME}_ENABLE_TriKota)

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@
		INCLUDE(TribitsAddExecutableAndTest)

		IF(${PACKAGE_NAME}_ENABLE_ArrayFireCPU)

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@
		INCLUDE(TribitsAddExecutableAndTest)


		TRIBITS_ADD_EXECUTABLE_AND_TEST(
Expand Down