Skip to content

Commit 3ecab39

Browse files
committed
Alternative: unconditionally install all headers, incl distributed
1 parent 2066ed1 commit 3ecab39

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

CMakeLists.txt

+4-14
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,17 @@ target_include_directories(ArborX INTERFACE
7878
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
7979
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/geometry>
8080
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/cluster>
81+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/distributed>
8182
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/interpolation>
8283
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/spatial>
8384
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
8485
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ArborX>
8586
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ArborX/geometry>
8687
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ArborX/cluster>
88+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ArborX/distributed>
8789
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ArborX/interpolation>
8890
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ArborX/spatial>
8991
)
90-
if (ARBORX_ENABLE_MPI)
91-
target_include_directories(ArborX INTERFACE
92-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/distributed>
93-
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ArborX/distributed>
94-
)
95-
endif()
9692

9793
install(TARGETS ArborX
9894
EXPORT ArborXTargets
@@ -149,14 +145,8 @@ install(FILES
149145
${CMAKE_CURRENT_BINARY_DIR}/ArborXSettings.cmake
150146
DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/ArborX )
151147

152-
if(ARBORX_ENABLE_MPI)
153-
install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ArborX
154-
FILES_MATCHING PATTERN "*.hpp")
155-
else()
156-
install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ArborX
157-
FILES_MATCHING PATTERN "*.hpp"
158-
PATTERN "*Distribut*" EXCLUDE)
159-
endif()
148+
install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ArborX
149+
FILES_MATCHING PATTERN "*.hpp")
160150
install(DIRECTORY ${PROJECT_BINARY_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ArborX
161151
FILES_MATCHING PATTERN "*.hpp")
162152

0 commit comments

Comments
 (0)