SEACAS: Remove usage of deprecated include_directories() (TriBITSPub/…

…TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want. 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_include_directories_r.sh from scratch.
bartlettroscoe · Dec 21, 2022 · c28616f · c28616f
1 parent 6a6702b
commit c28616f
Show file tree

Hide file tree

Showing 64 changed files with 69 additions and 69 deletions.
diff --git a/packages/seacas/applications/algebra/CMakeLists.txt b/packages/seacas/applications/algebra/CMakeLists.txt
@@ -2,7 +2,7 @@ INCLUDE(FortranSettings)
 
 TRIBITS_SUBPACKAGE(Algebra)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/aprepro/CMakeLists.txt b/packages/seacas/applications/aprepro/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 TRIBITS_SUBPACKAGE(Aprepro)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
 )

diff --git a/packages/seacas/applications/blot/CMakeLists.txt b/packages/seacas/applications/blot/CMakeLists.txt
@@ -2,7 +2,7 @@ INCLUDE(FortranSettings)
 
 TRIBITS_SUBPACKAGE(Blot)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/conjoin/CMakeLists.txt b/packages/seacas/applications/conjoin/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 TRIBITS_SUBPACKAGE(Conjoin)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/cpup/CMakeLists.txt b/packages/seacas/applications/cpup/CMakeLists.txt
@@ -8,7 +8,7 @@
 
 TRIBITS_SUBPACKAGE(Cpup)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/ejoin/CMakeLists.txt b/packages/seacas/applications/ejoin/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 TRIBITS_SUBPACKAGE(Ejoin)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/epu/CMakeLists.txt b/packages/seacas/applications/epu/CMakeLists.txt
@@ -8,7 +8,7 @@
 
 TRIBITS_SUBPACKAGE(Epu)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/ex1ex2v2/CMakeLists.txt b/packages/seacas/applications/ex1ex2v2/CMakeLists.txt
@@ -2,7 +2,7 @@ INCLUDE(FortranSettings)
 
 TRIBITS_SUBPACKAGE(Ex1ex2v2)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/ex2ex1v2/CMakeLists.txt b/packages/seacas/applications/ex2ex1v2/CMakeLists.txt
@@ -2,7 +2,7 @@ INCLUDE(FortranSettings)
 
 TRIBITS_SUBPACKAGE(Ex2ex1v2)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/exo2mat/CMakeLists.txt b/packages/seacas/applications/exo2mat/CMakeLists.txt
@@ -3,7 +3,7 @@ IF (TPL_ENABLE_Matio)
 TRIBITS_SUBPACKAGE(Exo2mat)
 
 LINK_DIRECTORIES(${Matio_LIBRARY_DIRS})
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${Matio_INCLUDE_DIRS}"
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )

diff --git a/packages/seacas/applications/exo_format/CMakeLists.txt b/packages/seacas/applications/exo_format/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 TRIBITS_SUBPACKAGE(Exo_format)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/exodiff/CMakeLists.txt b/packages/seacas/applications/exodiff/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 TRIBITS_SUBPACKAGE(Exodiff)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/exomatlab/CMakeLists.txt b/packages/seacas/applications/exomatlab/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 TRIBITS_SUBPACKAGE(Exomatlab)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/exotec2/CMakeLists.txt b/packages/seacas/applications/exotec2/CMakeLists.txt
@@ -1,6 +1,6 @@
 TRIBITS_SUBPACKAGE(Exotec2)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/exotxt/CMakeLists.txt b/packages/seacas/applications/exotxt/CMakeLists.txt
@@ -2,7 +2,7 @@ INCLUDE(FortranSettings)
 
 TRIBITS_SUBPACKAGE(Exotxt)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/explore/CMakeLists.txt b/packages/seacas/applications/explore/CMakeLists.txt
@@ -6,7 +6,7 @@ endif()
 
 TRIBITS_SUBPACKAGE(Explore)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/fastq/CMakeLists.txt b/packages/seacas/applications/fastq/CMakeLists.txt
@@ -2,7 +2,7 @@ INCLUDE(FortranSettings)
 
 TRIBITS_SUBPACKAGE(Fastq)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
   )
 

diff --git a/packages/seacas/applications/gen3d/CMakeLists.txt b/packages/seacas/applications/gen3d/CMakeLists.txt
@@ -2,7 +2,7 @@ INCLUDE(FortranSettings)
 
 TRIBITS_SUBPACKAGE(Gen3D)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/genshell/CMakeLists.txt b/packages/seacas/applications/genshell/CMakeLists.txt
@@ -2,7 +2,7 @@ INCLUDE(FortranSettings)
 
 TRIBITS_SUBPACKAGE(Genshell)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/gjoin/CMakeLists.txt b/packages/seacas/applications/gjoin/CMakeLists.txt
@@ -2,7 +2,7 @@ INCLUDE(FortranSettings)
 
 TRIBITS_SUBPACKAGE(Gjoin)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/grepos/CMakeLists.txt b/packages/seacas/applications/grepos/CMakeLists.txt
@@ -2,7 +2,7 @@ INCLUDE(FortranSettings)
 
 TRIBITS_SUBPACKAGE(Grepos)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/mapvar-kd/CMakeLists.txt b/packages/seacas/applications/mapvar-kd/CMakeLists.txt
@@ -2,7 +2,7 @@ INCLUDE(FortranSettings)
 
 TRIBITS_SUBPACKAGE(Mapvar-kd)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/mapvar/CMakeLists.txt b/packages/seacas/applications/mapvar/CMakeLists.txt
@@ -2,7 +2,7 @@ INCLUDE(FortranSettings)
 
 TRIBITS_SUBPACKAGE(Mapvar)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/mat2exo/CMakeLists.txt b/packages/seacas/applications/mat2exo/CMakeLists.txt
@@ -3,7 +3,7 @@ IF (TPL_ENABLE_Matio)
 TRIBITS_SUBPACKAGE(Mat2exo)
 
 LINK_DIRECTORIES(${Matio_LIBRARY_DIRS})
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${Matio_INCLUDE_DIRS}"
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )

diff --git a/packages/seacas/applications/nas2exo/CMakeLists.txt b/packages/seacas/applications/nas2exo/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 TRIBITS_SUBPACKAGE(Nas2exo)
 
-INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}")
+TRIBITS_INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}")
 
 
 SET(HEADERS "")

diff --git a/packages/seacas/applications/nem_slice/CMakeLists.txt b/packages/seacas/applications/nem_slice/CMakeLists.txt
@@ -4,12 +4,12 @@ TRIBITS_SUBPACKAGE(Nemslice)
 
 ASSERT_DEFINED(${PROJECT_NAME}_ENABLE_Zoltan)
 IF (${PROJECT_NAME}_ENABLE_Zoltan)
-   INCLUDE_DIRECTORIES(${Zoltan_INCLUDE_DIRS})
+   TRIBITS_INCLUDE_DIRECTORIES(${Zoltan_INCLUDE_DIRS})
    SET(ZOLTAN_DEP zoltan)
    ADD_DEFINITIONS(-DUSE_ZOLTAN)
 ENDIF()
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 SET(HEADERS "")
 APPEND_GLOB(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.C)

diff --git a/packages/seacas/applications/nem_spread/CMakeLists.txt b/packages/seacas/applications/nem_spread/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 TRIBITS_SUBPACKAGE(Nemspread)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/numbers/CMakeLists.txt b/packages/seacas/applications/numbers/CMakeLists.txt
@@ -2,7 +2,7 @@ INCLUDE(FortranSettings)
 
 TRIBITS_SUBPACKAGE(Numbers)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/slice/CMakeLists.txt b/packages/seacas/applications/slice/CMakeLists.txt
@@ -5,7 +5,7 @@ IF (TPL_ENABLE_METIS)
    ADD_DEFINITIONS(-DUSE_METIS)
 ENDIF()
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 SET(HEADERS "")
 APPEND_GLOB(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.C)

diff --git a/packages/seacas/applications/txtexo/CMakeLists.txt b/packages/seacas/applications/txtexo/CMakeLists.txt
@@ -2,7 +2,7 @@ INCLUDE(FortranSettings)
 
 TRIBITS_SUBPACKAGE(Txtexo)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/applications/zellij/CMakeLists.txt b/packages/seacas/applications/zellij/CMakeLists.txt
@@ -3,12 +3,12 @@ TRIBITS_SUBPACKAGE(Zellij)
 
 ASSERT_DEFINED(${PROJECT_NAME}_ENABLE_Zoltan)
 IF (${PROJECT_NAME}_ENABLE_Zoltan)
-   INCLUDE_DIRECTORIES(${Zoltan_INCLUDE_DIRS})
+   TRIBITS_INCLUDE_DIRECTORIES(${Zoltan_INCLUDE_DIRS})
    SET(ZOLTAN_DEP zoltan)
    ADD_DEFINITIONS(-DUSE_ZOLTAN)
 ENDIF()
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

diff --git a/packages/seacas/libraries/aprepro_lib/CMakeLists.txt b/packages/seacas/libraries/aprepro_lib/CMakeLists.txt
@@ -15,7 +15,7 @@ IF (${CMAKE_PROJECT_NAME}_ENABLE_SEACASExodus)
   ADD_DEFINITIONS(-DEXODUS_SUPPORT)
 ENDIF()
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 

diff --git a/packages/seacas/libraries/chaco/CMakeLists.txt b/packages/seacas/libraries/chaco/CMakeLists.txt
@@ -6,7 +6,7 @@ SET(CHACO_VERSION_PATCH "0")
 SET(CHACO_VERSION "${CHACO_VERSION_MAJOR}.${CHACO_VERSION_MINOR}")
 SET(CHACO_VERSION_FULL "${CHACO_VERSION}.${CHACO_VERSION_PATCH}")
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}/main"
   "${CMAKE_CURRENT_SOURCE_DIR}/util"
   )

diff --git a/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt b/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt
@@ -4,7 +4,7 @@ TRIBITS_SUBPACKAGE(ExoIIv2for32)
 
 add_definitions(-DDEFAULT_REAL_INT)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
    "${CMAKE_CURRENT_SOURCE_DIR}/../exodus_for/include"
    "${CMAKE_CURRENT_SOURCE_DIR}/test"
    )

diff --git a/packages/seacas/libraries/exodus/CMakeLists.txt b/packages/seacas/libraries/exodus/CMakeLists.txt
@@ -4,7 +4,7 @@ if (SEACASExodus_ENABLE_STATIC)
 INCLUDE(InstallSymLink)
 endif()
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}/include"
 )
 

diff --git a/packages/seacas/libraries/exodus_for/CMakeLists.txt b/packages/seacas/libraries/exodus_for/CMakeLists.txt
@@ -6,7 +6,7 @@ endif()
 
 TRIBITS_SUBPACKAGE(Exodus_for)
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
    "${CMAKE_CURRENT_SOURCE_DIR}/include"
    "${CMAKE_CURRENT_SOURCE_DIR}/test"
    )

diff --git a/packages/seacas/libraries/ioss/src/CMakeLists.txt b/packages/seacas/libraries/ioss/src/CMakeLists.txt
@@ -63,7 +63,7 @@ IF (NOT TPL_ENABLE_MPI)
   LIST(REMOVE_ITEM HEADERS ${DIR}/Ioss_Decomposition.h)
 ENDIF()
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}"
   "${CMAKE_CURRENT_BINARY_DIR}"
   "${Zoltan_INCLUDE_DIRS}"

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

diff --git a/packages/seacas/libraries/ioss/src/adios/utest/CMakeLists.txt b/packages/seacas/libraries/ioss/src/adios/utest/CMakeLists.txt
@@ -10,7 +10,7 @@ TRIBITS_ADD_TEST(
   NUM_MPI_PROCS 1
 )
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}/../"
   "${CMAKE_CURRENT_BINARY_DIR}/../"
   "${CMAKE_CURRENT_SOURCE_DIR}/../../"

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

diff --git a/packages/seacas/libraries/ioss/src/cgns/CMakeLists.txt b/packages/seacas/libraries/ioss/src/cgns/CMakeLists.txt
@@ -23,7 +23,7 @@ IF (NOT TPL_ENABLE_MPI)
   LIST(REMOVE_ITEM HEADERS ${DIR}/Iocgns_ParallelDatabaseIO.h ${DIR}/Iocgns_DecompositionData.h)
 ENDIF()
 
-INCLUDE_DIRECTORIES(
+TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}/../"
   "${CMAKE_CURRENT_BINARY_DIR}/../"
 )

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

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