Skip to content

Commit

Permalink
Revert "TriBITS Snapshot 2022-12-12 working toward TriBITSPub/TriBITS#63
Browse files Browse the repository at this point in the history
"
  • Loading branch information
bartlettroscoe authored Dec 24, 2022
1 parent 0e6e857 commit b797941
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions adapters/gaasp/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
SET(HEADERS "")
SET(SOURCES "")

TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR})
SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_BINARY_DIR})
APPEND_SET(HEADERS ${DIR}/${PACKAGE_NAME}_config.h )

TRIBITS_SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
APPEND_GLOB(HEADERS ${DIR}/*.hpp)
APPEND_GLOB(SOURCES ${DIR}/*.cpp)

ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_GAASP_INTERNAL_TPL)
IF(${PACKAGE_NAME}_ENABLE_GAASP_INTERNAL_TPL)
TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../tpl_src)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../tpl_src)
ENDIF()

#
Expand Down
4 changes: 2 additions & 2 deletions adapters/gaasp/tpl_src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
SET(HEADERS "")
SET(SOURCES "")

TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})

TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})

FILE(GLOB HEADERS *.h)

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


TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../UnitTest)
INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../UnitTest)
ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)

FILE(GLOB SOURCES *.cpp)
Expand Down
2 changes: 1 addition & 1 deletion test/ThetaStepper/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@


TRIBITS_INCLUDE_DIRECTORIES(../UnitTest)
INCLUDE_DIRECTORIES(../UnitTest)
ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)

FILE(GLOB SOURCES *.cpp)
Expand Down

0 comments on commit b797941

Please sign in to comment.