Zoltan: 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.
sandialabs · Dec 21, 2022 · 6e504a8 · 6e504a8
1 parent 9617951
commit 6e504a8
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt b/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt
@@ -11,7 +11,7 @@ SET(SOURCES "")
 # siMPI/pyMPI/siMPI
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 SET(HEADERS ${HEADERS}
   mpi.h

diff --git a/packages/zoltan/src/CMakeLists.txt b/packages/zoltan/src/CMakeLists.txt
@@ -40,7 +40,7 @@ SET(NOINSTALLHEADERS "")
 SET(SOURCES "")
 SET(MODULES "")
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
 SET(HEADERS ${HEADERS}
   ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h
@@ -50,7 +50,7 @@ SET(HEADERS ${HEADERS}
 # src/include
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 APPEND_SET(HEADERS
   include/lbi_const.h
@@ -74,7 +74,7 @@ APPEND_SET(HEADERS
 # src/all
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/all)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/all)
 
 APPEND_SET(NOINSTALLHEADERS
   all/all_allo_const.h
@@ -88,7 +88,7 @@ APPEND_SET(SOURCES
 # src/coloring
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/coloring)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/coloring)
 
 APPEND_SET(NOINSTALLHEADERS
   coloring/coloring_const.h
@@ -108,7 +108,7 @@ APPEND_SET(SOURCES
 # src/graph
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/graph)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/graph)
 
 APPEND_SET(NOINSTALLHEADERS
   graph/graph.h
@@ -124,7 +124,7 @@ APPEND_SET(SOURCES
 # src/ha
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/ha)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/ha)
 
 APPEND_SET(NOINSTALLHEADERS
   ha/ha_const.h
@@ -141,7 +141,7 @@ APPEND_SET(SOURCES
 # src/hier
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/hier)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/hier)
 
 APPEND_SET(NOINSTALLHEADERS
   hier/hier.h
@@ -156,7 +156,7 @@ APPEND_SET(SOURCES
 # src/hsfc
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/hsfc)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/hsfc)
 
 APPEND_SET(NOINSTALLHEADERS
   hsfc/hsfc.h
@@ -175,7 +175,7 @@ APPEND_SET(SOURCES
 # src/lb
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lb)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lb)
 
 APPEND_SET(NOINSTALLHEADERS
   lb/lb_const.h
@@ -203,7 +203,7 @@ APPEND_SET(SOURCES
 # src/matrix
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/matrix)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/matrix)
 
 APPEND_SET(NOINSTALLHEADERS
   matrix/zoltan_matrix.h
@@ -221,7 +221,7 @@ APPEND_SET(SOURCES
 # src/order
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/order)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/order)
 
 APPEND_SET(NOINSTALLHEADERS
   order/order_const.h
@@ -244,7 +244,7 @@ ENDIF()
 # src/par
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/par)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/par)
 
 APPEND_SET(NOINSTALLHEADERS
   par/par_average_const.h
@@ -268,7 +268,7 @@ APPEND_SET(SOURCES
 # src/params
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/params)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/params)
 
 APPEND_SET(NOINSTALLHEADERS
   params/key_params.h
@@ -291,7 +291,7 @@ APPEND_SET(SOURCES
 # src/tpls
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/tpls)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/tpls)
 
 APPEND_SET(NOINSTALLHEADERS
   tpls/third_library_const.h
@@ -338,7 +338,7 @@ ENDIF()
 # src/phg
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/phg)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/phg)
 
 APPEND_SET(NOINSTALLHEADERS
   phg/phg_comm.h
@@ -383,7 +383,7 @@ APPEND_SET(SOURCES
 # src/rcb
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/rcb)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/rcb)
 
 APPEND_SET(NOINSTALLHEADERS
   rcb/create_proc_list_const.h
@@ -414,7 +414,7 @@ APPEND_SET(SOURCES
 # src/reftree
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/reftree)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/reftree)
 
 APPEND_SET(NOINSTALLHEADERS
   reftree/reftree_const.h
@@ -432,7 +432,7 @@ APPEND_SET(SOURCES
 # src/simple
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/simple)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/simple)
 
 APPEND_SET(SOURCES
   simple/block.c
@@ -448,7 +448,7 @@ APPEND_SET(NOINSTALLHEADERS
 # src/timer
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/timer)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/timer)
 
 APPEND_SET(NOINSTALLHEADERS
   timer/timer_const.h
@@ -462,10 +462,10 @@ APPEND_SET(SOURCES
 # src/Utilities
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities/Communication)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities/DDirectory)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities/Timer)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities/shared)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities/Communication)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities/DDirectory)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities/Timer)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities/shared)
 
 APPEND_SET(NOINSTALLHEADERS
   Utilities/Communication/comm.h
@@ -510,7 +510,7 @@ APPEND_SET(SOURCES
 # src/zz
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/zz)
+TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/zz)
 
 APPEND_SET(NOINSTALLHEADERS
   zz/zz_const.h
@@ -544,7 +544,7 @@ APPEND_SET(SOURCES
 #
 
 IF(${PROJECT_NAME}_ENABLE_Fortran AND BUILD_ZOLTAN_F90_INTERFACE)
-  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fort)
+  TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fort)
 
   APPEND_SET(NOINSTALLHEADERS
     fort/cwrap_fmangle.h

diff --git a/packages/zoltan/src/fdriver/CMakeLists.txt b/packages/zoltan/src/fdriver/CMakeLists.txt
@@ -21,7 +21,7 @@ IF(${PROJECT_NAME}_ENABLE_Fortran AND BUILD_ZOLTAN_F90_INTERFACE)
     APPEND_SET(ZFDRIVE_SOURCES farg_typical.f)
   ENDIF()
 
-  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+  TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
   TRIBITS_ADD_EXECUTABLE(
     zfdrive