Skip to content

Commit 508bd81

Browse files
author
Rutherford, Cameron
committed
Remove several blanket include_directories.
1 parent 05a5b2e commit 508bd81

File tree

4 files changed

+8
-18
lines changed

4 files changed

+8
-18
lines changed

CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,18 +100,11 @@ endif(RESOLVE_USE_HIP)
100100
configure_file(
101101
${CMAKE_SOURCE_DIR}/resolve/resolve_defs.hpp.in
102102
${CMAKE_BINARY_DIR}/resolve/resolve_defs.hpp)
103-
104-
# include build directory for Fortran name mangling header
105-
# TODO - target based includes
106-
include_directories(${CMAKE_BINARY_DIR})
107-
108103
install(
109104
FILES ${CMAKE_BINARY_DIR}/resolve/resolve_defs.hpp
110105
DESTINATION include/resolve
111106
)
112107

113-
# TODO - fix this
114-
include_directories(${CMAKE_SOURCE_DIR})
115108

116109
# Enable testing
117110
enable_testing()

resolve/cpu/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@ set(ReSolve_CPU_HEADER_INSTALL
1717

1818
# First create dummy backend
1919
add_library(resolve_backend_cpu SHARED ${ReSolve_CPU_SRC})
20-
target_link_libraries(resolve_backend_cpu PRIVATE resolve_logger)
21-
22-
target_include_directories(resolve_backend_cpu INTERFACE
23-
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
24-
$<INSTALL_INTERFACE:include>
25-
)
20+
target_link_libraries(resolve_backend_cpu PUBLIC resolve_logger)
2621

2722
# install include headers
2823
install(FILES ${ReSolve_CPU_HEADER_INSTALL} DESTINATION include/resolve/cpu)

resolve/utilities/logger/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ set(Logger_HEADER_INSTALL
1717
# Build shared library ReSolve
1818
add_library(resolve_logger SHARED ${Logger_SRC})
1919

20-
target_include_directories(resolve_logger INTERFACE
21-
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
20+
target_include_directories(resolve_logger PUBLIC
21+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
22+
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
2223
$<INSTALL_INTERFACE:include>
2324
)
2425

resolve/workspace/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ if(RESOLVE_USE_HIP)
4747
target_link_libraries(resolve_workspace PUBLIC resolve_backend_hip)
4848
endif(RESOLVE_USE_HIP)
4949

50-
target_include_directories(resolve_workspace INTERFACE
51-
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
52-
$<INSTALL_INTERFACE:include>
50+
target_include_directories(resolve_workspace PUBLIC
51+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
52+
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
53+
$<INSTALL_INTERFACE:include>
5354
)
5455

5556
# install include headers

0 commit comments

Comments
 (0)