From 07e335a802bceb48bccb62812915b108e34a437f Mon Sep 17 00:00:00 2001
From: "Roscoe A. Bartlett" <rabartl@sandia.gov>
Date: Wed, 11 Jan 2023 09:56:53 -0700
Subject: [PATCH] Revert "Revert "TriBITS Snapshot 2022-12-12 working toward
 TriBITSPub/TriBITS#63""

This reverts commit ae19a59061e4d9111c7cc9ae96bcefa315199326.

This brings back the version of TriBITS snapshotted in Trilinos PR
trilinos/Trilinos#11380.
---
 base/CMakeLists.txt             | 6 +++---
 support-Trilinos/CMakeLists.txt | 6 +++---
 unit_tests/CMakeLists.txt       | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
index abd14e3820e..01e9f222e51 100644
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
@@ -17,14 +17,14 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
 SET(HEADERS "")
 SET(SOURCES "")
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
 
 #
 # Core headers
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 FILE(GLOB HEADERS *.hpp *.h)
 
diff --git a/support-Trilinos/CMakeLists.txt b/support-Trilinos/CMakeLists.txt
index 381c2bc56fd..30bcd746a3a 100644
--- a/support-Trilinos/CMakeLists.txt
+++ b/support-Trilinos/CMakeLists.txt
@@ -17,8 +17,8 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
 SET(HEADERS "")
 SET(SOURCES "")
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
 
 SET(HEADERS ${HEADERS}
   ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h
@@ -28,7 +28,7 @@ SET(HEADERS ${HEADERS}
 # Core headers
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 FILE(GLOB HEADERS *.hpp)
 FILE(GLOB SOURCES *.cpp)
diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
index a35d476c0a2..c76c624b2c0 100644
--- a/unit_tests/CMakeLists.txt
+++ b/unit_tests/CMakeLists.txt
@@ -1,10 +1,10 @@
 
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../base)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../support-Trilinos)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../base)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../support-Trilinos)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/)
 
 TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)