Skip to content

Commit

Permalink
Pike: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (Tri…
Browse files Browse the repository at this point in the history
…BITSPub/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 change
wsa made with the TriBITS script:

  TriBITS/refactoring/replace_set_and_inc_dirs_r.sh
  • Loading branch information
bartlettroscoe committed Dec 20, 2022
1 parent 0b933e6 commit 8d5b1dc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions blackbox/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ TRIBITS_CONFIGURE_FILE(Pike_BlackBox_config.hpp)
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}/*.hpp)
APPEND_GLOB(SOURCES ${DIR}/*.cpp)
#IF (NOT ${PACKAGE_NAME}_ENABLE_EXPERIMENTAL)
Expand All @@ -26,7 +26,7 @@ APPEND_GLOB(SOURCES ${DIR}/*.cpp)
TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR})

# Must glob the binary dir last to get all of the auto-generated headers
SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR})
TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR})
APPEND_GLOB(HEADERS ${DIR}/*.hpp)

#
Expand Down
2 changes: 1 addition & 1 deletion blackbox/test/models/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
SET(HEADERS "")
SET(NOINSTALLHEADERS "")
SET(SOURCES "")
Expand Down
4 changes: 2 additions & 2 deletions implicit/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ INCLUDE(TrilinosCreateClientTemplateHeaders)
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}/*.hpp)
APPEND_GLOB(SOURCES ${DIR}/*.cpp)
TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS(${DIR})

# Must glob the binary dir last to get all of the auto-generated headers
SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR})
TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR})
APPEND_GLOB(HEADERS ${DIR}/*.hpp)

#
Expand Down

0 comments on commit 8d5b1dc

Please sign in to comment.