Revert "Revert "TriBITS Snapshot 2022-12-12 working toward TriBITSPub…

…/TriBITS#63"" This reverts commit ae19a59. This brings back the version of TriBITS snapshotted in Trilinos PR trilinos/Trilinos#11380.
trilinos · Jan 11, 2023 · a4252d8 · a4252d8
1 parent b797941
commit a4252d8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/adapters/gaasp/src/CMakeLists.txt b/adapters/gaasp/src/CMakeLists.txt
@@ -13,16 +13,16 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
 SET(HEADERS "")
 SET(SOURCES "")
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR})
 APPEND_SET(HEADERS ${DIR}/${PACKAGE_NAME}_config.h )
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.hpp)
 APPEND_GLOB(SOURCES ${DIR}/*.cpp)
 
 ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_GAASP_INTERNAL_TPL)
 IF(${PACKAGE_NAME}_ENABLE_GAASP_INTERNAL_TPL)
-  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../tpl_src)
+  TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../tpl_src)
 ENDIF()
 
 #

diff --git a/adapters/gaasp/tpl_src/CMakeLists.txt b/adapters/gaasp/tpl_src/CMakeLists.txt
@@ -13,9 +13,9 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
 SET(HEADERS "")
 SET(SOURCES "")
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 FILE(GLOB HEADERS *.h)
 

diff --git a/test/Charon/CMakeLists.txt b/test/Charon/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 
-INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../UnitTest)
+TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../UnitTest)
 ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
 
 FILE(GLOB SOURCES *.cpp)

diff --git a/test/ThetaStepper/CMakeLists.txt b/test/ThetaStepper/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 
-INCLUDE_DIRECTORIES(../UnitTest)
+TRIBITS_INCLUDE_DIRECTORIES(../UnitTest)
 ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
 
 FILE(GLOB SOURCES *.cpp)