SEACAS: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (T…

…riBITSPub/TriBITS#429) A refactoring in TriBITS related to tribits_include_directories() (see TriBITSPub/TriBITS#553) required renaming set_and_inc_dirs() to tribits_set_and_inc_dirs() and deprecating the former. The deprecated TriBITS macro set_and_inc_dirs() now issues a CMake Deprecation warning. This matches a similar commit from PR trilinos/Trilinos#11380 I was not able to use git format-patch and git am to apply the patch from the Trilinos branch due to no current clean snapshot so I had to run the tool TriBITS/refactoring/replace_set_and_inc_dirs_r.sh from scratch.
bartlettroscoe · Dec 21, 2022 · 6ece46f · 6ece46f
1 parent f3613f7
commit 6ece46f
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 19 deletions.
diff --git a/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt b/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt
@@ -9,7 +9,7 @@ TRIBITS_INCLUDE_DIRECTORIES(
    "${CMAKE_CURRENT_SOURCE_DIR}/test"
    )
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 TRIBITS_ADD_LIBRARY(
   exoIIv2for32

diff --git a/packages/seacas/libraries/exodus/CMakeLists.txt b/packages/seacas/libraries/exodus/CMakeLists.txt
@@ -19,7 +19,7 @@ if (NOT ${EXODUS_THREADSAFE})
    list(REMOVE_ITEM SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/ex_threadsafe.c)
 endif()
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR})
 
 SET(HEADERS
   include/exodusII.h

diff --git a/packages/seacas/libraries/exodus_for/CMakeLists.txt b/packages/seacas/libraries/exodus_for/CMakeLists.txt
@@ -12,7 +12,7 @@ TRIBITS_INCLUDE_DIRECTORIES(
    )
 
 SET(SOURCES "")
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 APPEND_GLOB(SOURCES ${DIR}/src/*.c ${DIR}/src/*.F)
 LIST(REMOVE_ITEM SOURCES "${DIR}/src/exo_jack-windows.c")

diff --git a/packages/seacas/libraries/ioss/src/CMakeLists.txt b/packages/seacas/libraries/ioss/src/CMakeLists.txt
@@ -48,7 +48,7 @@ IF (NOT TPL_ENABLE_ParMETIS)
   ADD_DEFINITIONS(-DNO_PARMETIS_SUPPORT)
 ENDIF()
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/Ioss_*.h)
 APPEND_GLOB(HEADERS ${DIR}/tokenize.h)
 APPEND_GLOB(HEADERS ${DIR}/io_info.h)

diff --git a/packages/seacas/libraries/ioss/src/adios/CMakeLists.txt b/packages/seacas/libraries/ioss/src/adios/CMakeLists.txt
@@ -1,7 +1,7 @@
 SET(HEADERS "")
 SET(SOURCES "")
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.h*)
 APPEND_GLOB(SOURCES ${DIR}/*.C)
 

diff --git a/packages/seacas/libraries/ioss/src/catalyst/CMakeLists.txt b/packages/seacas/libraries/ioss/src/catalyst/CMakeLists.txt
@@ -1,7 +1,7 @@
 SET(HEADERS "")
 SET(SOURCES "")
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.h*)
 APPEND_GLOB(SOURCES ${DIR}/*.C)
 

diff --git a/packages/seacas/libraries/ioss/src/cgns/CMakeLists.txt b/packages/seacas/libraries/ioss/src/cgns/CMakeLists.txt
@@ -14,7 +14,7 @@ ELSE()
 ENDIF()
 ENDIF()
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.h)
 APPEND_GLOB(SOURCES ${DIR}/*.C)
 

diff --git a/packages/seacas/libraries/ioss/src/exodus/CMakeLists.txt b/packages/seacas/libraries/ioss/src/exodus/CMakeLists.txt
@@ -2,7 +2,7 @@
 SET(HEADERS "")
 SET(SOURCES "")
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.h)
 APPEND_GLOB(SOURCES ${DIR}/*.C)
 

diff --git a/packages/seacas/libraries/ioss/src/faodel/CMakeLists.txt b/packages/seacas/libraries/ioss/src/faodel/CMakeLists.txt
@@ -1,7 +1,7 @@
 SET(HEADERS "")
 SET(SOURCES "")
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.h)
 APPEND_GLOB(SOURCES ${DIR}/*.C)
 

diff --git a/packages/seacas/libraries/ioss/src/gen_struc/CMakeLists.txt b/packages/seacas/libraries/ioss/src/gen_struc/CMakeLists.txt
@@ -1,7 +1,7 @@
 SET(HEADERS "")
 SET(SOURCES "")
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.h)
 APPEND_GLOB(SOURCES ${DIR}/*.C)
 

diff --git a/packages/seacas/libraries/ioss/src/generated/CMakeLists.txt b/packages/seacas/libraries/ioss/src/generated/CMakeLists.txt
@@ -2,7 +2,7 @@
 SET(HEADERS "")
 SET(SOURCES "")
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.h)
 APPEND_GLOB(SOURCES ${DIR}/*.C)
 

diff --git a/packages/seacas/libraries/ioss/src/heartbeat/CMakeLists.txt b/packages/seacas/libraries/ioss/src/heartbeat/CMakeLists.txt
@@ -2,7 +2,7 @@
 SET(HEADERS "")
 SET(SOURCES "")
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.h)
 APPEND_GLOB(SOURCES ${DIR}/*.C)
 

diff --git a/packages/seacas/libraries/ioss/src/init/CMakeLists.txt b/packages/seacas/libraries/ioss/src/init/CMakeLists.txt
@@ -2,7 +2,7 @@
 SET(HEADERS "")
 SET(SOURCES "")
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.h)
 APPEND_GLOB(SOURCES ${DIR}/*.C)
 

diff --git a/packages/seacas/libraries/ioss/src/main/CMakeLists.txt b/packages/seacas/libraries/ioss/src/main/CMakeLists.txt
@@ -1,7 +1,7 @@
 SET(HEADERS "")
 SET(SOURCES "")
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.h)
 APPEND_GLOB(SOURCES ${DIR}/*.C)
 

diff --git a/packages/seacas/libraries/ioss/src/pamgen/CMakeLists.txt b/packages/seacas/libraries/ioss/src/pamgen/CMakeLists.txt
@@ -2,7 +2,7 @@
 SET(HEADERS "")
 SET(SOURCES "")
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.h)
 APPEND_GLOB(SOURCES ${DIR}/*.C)
 

diff --git a/packages/seacas/libraries/ioss/src/text_mesh/CMakeLists.txt b/packages/seacas/libraries/ioss/src/text_mesh/CMakeLists.txt
@@ -2,7 +2,7 @@
 SET(HEADERS "")
 SET(SOURCES "")
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.h)
 APPEND_GLOB(SOURCES ${DIR}/*.C)
 

diff --git a/packages/seacas/libraries/ioss/src/transform/CMakeLists.txt b/packages/seacas/libraries/ioss/src/transform/CMakeLists.txt
@@ -2,7 +2,7 @@
 SET(HEADERS "")
 SET(SOURCES "")
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/*.h)
 APPEND_GLOB(SOURCES ${DIR}/*.C)
 

diff --git a/packages/seacas/libraries/ioss/src/visualization/CMakeLists.txt b/packages/seacas/libraries/ioss/src/visualization/CMakeLists.txt
@@ -2,7 +2,7 @@
 SET(HEADERS "")
 SET(SOURCES "")
 
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 APPEND_GLOB(HEADERS ${DIR}/cgns/*.h)
 APPEND_GLOB(SOURCES ${DIR}/cgns/*.C)
 APPEND_GLOB(HEADERS ${DIR}/exodus/*.h)

diff --git a/packages/seacas/libraries/plt/CMakeLists.txt b/packages/seacas/libraries/plt/CMakeLists.txt
@@ -9,7 +9,7 @@ SET(PLT_VERSION "${PLT_VERSION_MAJOR}.${PLT_VERSION_MINOR}")
 SET(PLT_VERSION_FULL "${PLT_VERSION}.${PLT_VERSION_PATCH}")
 
 SET(SOURCES "")
-SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 APPEND_GLOB(SOURCES ${DIR}/*.f ${DIR}/*.F ${DIR}/*.c)