Skip to content

Commit abeac82

Browse files
committed
Remove global includes and use target include for all "common" modules.
1 parent 997756d commit abeac82

27 files changed

Lines changed: 11 additions & 50 deletions

File tree

2d/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ set(impl_incs
2929
"include/pcl/${SUBSYS_NAME}/impl/morphology.hpp"
3030
)
3131

32-
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
33-
3432
set(LIB_NAME "pcl_${SUBSYS_NAME}")
3533
PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS} HEADER_ONLY)
3634

cmake/pcl_targets.cmake

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,11 @@ function(PCL_ADD_LIBRARY _name)
196196
PCL_ADD_VERSION_INFO(${_name})
197197
target_compile_features(${_name} PUBLIC ${PCL_CXX_COMPILE_FEATURES})
198198

199+
target_include_directories(${_name} PUBLIC
200+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
201+
$<INSTALL_INTERFACE:${INCLUDE_INSTALL_ROOT}>
202+
)
203+
199204
target_link_libraries(${_name} Threads::Threads)
200205
if(TARGET OpenMP::OpenMP_CXX)
201206
target_link_libraries(${_name} OpenMP::OpenMP_CXX)
@@ -257,6 +262,11 @@ function(PCL_CUDA_ADD_LIBRARY _name)
257262

258263
target_compile_options(${_name} PRIVATE $<$<COMPILE_LANGUAGE:CUDA>: ${GEN_CODE} --expt-relaxed-constexpr>)
259264

265+
target_include_directories(${_name} PUBLIC
266+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
267+
$<INSTALL_INTERFACE:${INCLUDE_INSTALL_ROOT}>
268+
)
269+
260270
target_include_directories(${_name} PRIVATE ${CUDA_TOOLKIT_INCLUDE})
261271

262272
if(MSVC)

common/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,6 @@ set(kissfft_srcs
174174
set(LIB_NAME "pcl_${SUBSYS_NAME}")
175175
PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${kissfft_srcs} ${incs} ${common_incs} ${impl_incs} ${tools_incs} ${kissfft_incs} ${common_incs_impl} ${range_image_incs} ${range_image_incs_impl})
176176

177-
target_include_directories(${LIB_NAME} PUBLIC
178-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
179-
$<INSTALL_INTERFACE:include>
180-
)
181-
182177
target_link_libraries(${LIB_NAME} Boost::boost Eigen3::Eigen)
183178

184179
if(MSVC AND NOT (MSVC_VERSION LESS 1915))

features/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ if(NOT build)
1111
return()
1212
endif()
1313

14-
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
15-
1614
set(incs
1715
"include/pcl/${SUBSYS_NAME}/boost.h"
1816
"include/pcl/${SUBSYS_NAME}/eigen.h"

filters/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ set(impl_incs
131131
)
132132

133133
set(LIB_NAME "pcl_${SUBSYS_NAME}")
134-
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
135134
PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs})
136135
target_link_libraries("${LIB_NAME}" pcl_common pcl_sample_consensus pcl_search pcl_kdtree pcl_octree)
137136
PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS})

geometry/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,8 @@ set(impl_incs
3737

3838

3939
set(LIB_NAME "pcl_${SUBSYS_NAME}")
40-
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
4140

4241
add_library(${LIB_NAME} INTERFACE)
43-
target_include_directories(${LIB_NAME} INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include")
4442
target_link_libraries(${LIB_NAME} INTERFACE Boost::boost pcl_common)
4543

4644
PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS} HEADER_ONLY)

io/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ if(MINGW)
209209
target_link_libraries(pcl_io_ply ws2_32)
210210
endif()
211211
PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/ply" ${PLY_INCLUDES})
212-
target_include_directories(pcl_io_ply PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
213212
target_link_libraries(pcl_io_ply pcl_common Boost::boost)
214213

215214
set(srcs
@@ -340,8 +339,6 @@ add_definitions(${VTK_DEFINES})
340339

341340
PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${compression_incs} ${impl_incs} ${OPENNI_INCLUDES} ${OPENNI2_INCLUDES})
342341

343-
target_include_directories(${LIB_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
344-
345342
target_link_libraries("${LIB_NAME}" Boost::boost Boost::iostreams pcl_common pcl_io_ply)
346343
if(TARGET Boost::filesystem)
347344
target_link_libraries("${LIB_NAME}" Boost::filesystem)

kdtree/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ set(impl_incs
2727
)
2828

2929
set(LIB_NAME "pcl_${SUBSYS_NAME}")
30-
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
3130
PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs})
3231
target_link_libraries("${LIB_NAME}" pcl_common FLANN::FLANN)
3332
set(EXT_DEPS flann)

keypoints/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ set(impl_incs
5858
)
5959

6060
set(LIB_NAME "pcl_${SUBSYS_NAME}")
61-
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
6261
PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs})
6362
target_link_libraries("${LIB_NAME}" pcl_features pcl_filters)
6463
PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS})

ml/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ set(srcs
7474
)
7575

7676
set(LIB_NAME "pcl_${SUBSYS_NAME}")
77-
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
7877
PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs})
7978
SET_TARGET_PROPERTIES("${LIB_NAME}" PROPERTIES LINKER_LANGUAGE CXX)
8079
target_link_libraries("${LIB_NAME}" pcl_common)

0 commit comments

Comments
 (0)