File tree Expand file tree Collapse file tree 4 files changed +8
-18
lines changed Expand file tree Collapse file tree 4 files changed +8
-18
lines changed Original file line number Diff line number Diff line change @@ -100,18 +100,11 @@ endif(RESOLVE_USE_HIP)
100
100
configure_file (
101
101
${CMAKE_SOURCE_DIR} /resolve/resolve_defs.hpp.in
102
102
${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
-
108
103
install (
109
104
FILES ${CMAKE_BINARY_DIR} /resolve/resolve_defs.hpp
110
105
DESTINATION include /resolve
111
106
)
112
107
113
- # TODO - fix this
114
- include_directories (${CMAKE_SOURCE_DIR} )
115
108
116
109
# Enable testing
117
110
enable_testing ()
Original file line number Diff line number Diff line change @@ -17,12 +17,7 @@ set(ReSolve_CPU_HEADER_INSTALL
17
17
18
18
# First create dummy backend
19
19
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 )
26
21
27
22
# install include headers
28
23
install (FILES ${ReSolve_CPU_HEADER_INSTALL} DESTINATION include /resolve/cpu )
Original file line number Diff line number Diff line change @@ -17,8 +17,9 @@ set(Logger_HEADER_INSTALL
17
17
# Build shared library ReSolve
18
18
add_library (resolve_logger SHARED ${Logger_SRC} )
19
19
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} >
22
23
$< INSTALL_INTERFACE:include>
23
24
)
24
25
Original file line number Diff line number Diff line change @@ -47,9 +47,10 @@ if(RESOLVE_USE_HIP)
47
47
target_link_libraries (resolve_workspace PUBLIC resolve_backend_hip )
48
48
endif (RESOLVE_USE_HIP )
49
49
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>
53
54
)
54
55
55
56
# install include headers
You can’t perform that action at this time.
0 commit comments