diff --git a/2d/CMakeLists.txt b/2d/CMakeLists.txt index e706ca4e7a6..457aae7dbcf 100644 --- a/2d/CMakeLists.txt +++ b/2d/CMakeLists.txt @@ -29,8 +29,6 @@ set(impl_incs "include/pcl/${SUBSYS_NAME}/impl/morphology.hpp" ) -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") - set(LIB_NAME "pcl_${SUBSYS_NAME}") PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS} HEADER_ONLY) diff --git a/cmake/pcl_targets.cmake b/cmake/pcl_targets.cmake index 2da076c23c5..f3ca56d1c54 100644 --- a/cmake/pcl_targets.cmake +++ b/cmake/pcl_targets.cmake @@ -196,6 +196,11 @@ function(PCL_ADD_LIBRARY _name) PCL_ADD_VERSION_INFO(${_name}) target_compile_features(${_name} PUBLIC ${PCL_CXX_COMPILE_FEATURES}) + target_include_directories(${_name} PUBLIC + $ + $ + ) + target_link_libraries(${_name} Threads::Threads) if(TARGET OpenMP::OpenMP_CXX) target_link_libraries(${_name} OpenMP::OpenMP_CXX) @@ -257,6 +262,11 @@ function(PCL_CUDA_ADD_LIBRARY _name) target_compile_options(${_name} PRIVATE $<$: ${GEN_CODE} --expt-relaxed-constexpr>) + target_include_directories(${_name} PUBLIC + $ + $ + ) + target_include_directories(${_name} PRIVATE ${CUDA_TOOLKIT_INCLUDE}) if(MSVC) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index fd449f2eff6..103cdd5b0b4 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -174,11 +174,6 @@ set(kissfft_srcs set(LIB_NAME "pcl_${SUBSYS_NAME}") 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}) -target_include_directories(${LIB_NAME} PUBLIC - $ - $ -) - target_link_libraries(${LIB_NAME} Boost::boost Eigen3::Eigen) if(MSVC AND NOT (MSVC_VERSION LESS 1915)) diff --git a/features/CMakeLists.txt b/features/CMakeLists.txt index cdf17fdef29..2b280563372 100644 --- a/features/CMakeLists.txt +++ b/features/CMakeLists.txt @@ -11,8 +11,6 @@ if(NOT build) return() endif() -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") - set(incs "include/pcl/${SUBSYS_NAME}/boost.h" "include/pcl/${SUBSYS_NAME}/eigen.h" diff --git a/filters/CMakeLists.txt b/filters/CMakeLists.txt index a485505b5ab..eb49b3f37d4 100644 --- a/filters/CMakeLists.txt +++ b/filters/CMakeLists.txt @@ -131,7 +131,6 @@ set(impl_incs ) set(LIB_NAME "pcl_${SUBSYS_NAME}") -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs}) target_link_libraries("${LIB_NAME}" pcl_common pcl_sample_consensus pcl_search pcl_kdtree pcl_octree) PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS}) diff --git a/geometry/CMakeLists.txt b/geometry/CMakeLists.txt index 0ec3e6fe5b0..2e0a9ee58b8 100644 --- a/geometry/CMakeLists.txt +++ b/geometry/CMakeLists.txt @@ -37,10 +37,8 @@ set(impl_incs set(LIB_NAME "pcl_${SUBSYS_NAME}") -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") add_library(${LIB_NAME} INTERFACE) -target_include_directories(${LIB_NAME} INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include") target_link_libraries(${LIB_NAME} INTERFACE Boost::boost pcl_common) PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS} HEADER_ONLY) diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt index 470796f9a1c..d02a25bb88a 100644 --- a/io/CMakeLists.txt +++ b/io/CMakeLists.txt @@ -209,7 +209,6 @@ if(MINGW) target_link_libraries(pcl_io_ply ws2_32) endif() PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/ply" ${PLY_INCLUDES}) -target_include_directories(pcl_io_ply PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") target_link_libraries(pcl_io_ply pcl_common Boost::boost) set(srcs @@ -340,8 +339,6 @@ add_definitions(${VTK_DEFINES}) PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${compression_incs} ${impl_incs} ${OPENNI_INCLUDES} ${OPENNI2_INCLUDES}) -target_include_directories(${LIB_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") - target_link_libraries("${LIB_NAME}" Boost::boost Boost::iostreams pcl_common pcl_io_ply) if(TARGET Boost::filesystem) target_link_libraries("${LIB_NAME}" Boost::filesystem) diff --git a/kdtree/CMakeLists.txt b/kdtree/CMakeLists.txt index e015aa3178f..9487af14e4a 100644 --- a/kdtree/CMakeLists.txt +++ b/kdtree/CMakeLists.txt @@ -27,7 +27,6 @@ set(impl_incs ) set(LIB_NAME "pcl_${SUBSYS_NAME}") -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs}) target_link_libraries("${LIB_NAME}" pcl_common FLANN::FLANN) set(EXT_DEPS flann) diff --git a/keypoints/CMakeLists.txt b/keypoints/CMakeLists.txt index de9189a7b47..1964878c82e 100644 --- a/keypoints/CMakeLists.txt +++ b/keypoints/CMakeLists.txt @@ -58,7 +58,6 @@ set(impl_incs ) set(LIB_NAME "pcl_${SUBSYS_NAME}") -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs}) target_link_libraries("${LIB_NAME}" pcl_features pcl_filters) PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS}) diff --git a/ml/CMakeLists.txt b/ml/CMakeLists.txt index a67a5835b8a..7c4c112acf1 100644 --- a/ml/CMakeLists.txt +++ b/ml/CMakeLists.txt @@ -74,7 +74,6 @@ set(srcs ) set(LIB_NAME "pcl_${SUBSYS_NAME}") -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs}) SET_TARGET_PROPERTIES("${LIB_NAME}" PROPERTIES LINKER_LANGUAGE CXX) target_link_libraries("${LIB_NAME}" pcl_common) diff --git a/octree/CMakeLists.txt b/octree/CMakeLists.txt index 5f5a431e928..2270690adc5 100644 --- a/octree/CMakeLists.txt +++ b/octree/CMakeLists.txt @@ -50,7 +50,6 @@ set(impl_incs set(LIB_NAME "pcl_${SUBSYS_NAME}") PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs}) target_link_libraries("${LIB_NAME}" pcl_common) -target_include_directories(${LIB_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS}) # Install include files diff --git a/outofcore/CMakeLists.txt b/outofcore/CMakeLists.txt index dd2a7d8a9c5..eb71895d7c0 100644 --- a/outofcore/CMakeLists.txt +++ b/outofcore/CMakeLists.txt @@ -67,7 +67,6 @@ set(visualization_incs set(LIB_NAME "pcl_${SUBSYS_NAME}") -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs} ${visualization_incs}) #PCL_ADD_SSE_FLAGS("${LIB_NAME}") target_link_libraries("${LIB_NAME}" pcl_common pcl_visualization ${Boost_SYSTEM_LIBRARY}) diff --git a/people/CMakeLists.txt b/people/CMakeLists.txt index d49ebf2947e..f2b11e838e6 100644 --- a/people/CMakeLists.txt +++ b/people/CMakeLists.txt @@ -33,8 +33,6 @@ set(srcs ) set(LIB_NAME "pcl_${SUBSYS_NAME}") -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") - PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs}) target_link_libraries(${LIB_NAME} pcl_common pcl_filters pcl_kdtree pcl_sample_consensus pcl_segmentation pcl_visualization) diff --git a/recognition/CMakeLists.txt b/recognition/CMakeLists.txt index 2cda7232be4..ac88a58cbe4 100644 --- a/recognition/CMakeLists.txt +++ b/recognition/CMakeLists.txt @@ -158,7 +158,6 @@ else() endif() set(LIB_NAME "pcl_${SUBSYS_NAME}") -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs} ${face_detection_incs} ${ransac_based_incs} ${ransac_based_impl_incs} ${hv_incs} ${hv_impl_incs} ${cg_incs} ${cg_impl_incs} ${metslib_incs}) target_link_libraries("${LIB_NAME}" pcl_common pcl_kdtree pcl_octree pcl_search pcl_features pcl_registration pcl_sample_consensus pcl_filters pcl_ml pcl_io) diff --git a/registration/CMakeLists.txt b/registration/CMakeLists.txt index bc8ae11a9f2..cb7bc435e63 100644 --- a/registration/CMakeLists.txt +++ b/registration/CMakeLists.txt @@ -172,7 +172,6 @@ set(srcs ) set(LIB_NAME "pcl_${SUBSYS_NAME}") -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs}) target_link_libraries("${LIB_NAME}" pcl_kdtree pcl_search pcl_sample_consensus pcl_features pcl_filters) PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS}) diff --git a/sample_consensus/CMakeLists.txt b/sample_consensus/CMakeLists.txt index 65652158927..4ce23771bdd 100644 --- a/sample_consensus/CMakeLists.txt +++ b/sample_consensus/CMakeLists.txt @@ -90,7 +90,6 @@ set(impl_incs ) set(LIB_NAME "pcl_${SUBSYS_NAME}") -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs}) target_link_libraries("${LIB_NAME}" pcl_common) PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS}) diff --git a/search/CMakeLists.txt b/search/CMakeLists.txt index e0296cd8e95..d8422ab9e54 100644 --- a/search/CMakeLists.txt +++ b/search/CMakeLists.txt @@ -38,7 +38,6 @@ set(impl_incs ) set(LIB_NAME "pcl_${SUBSYS_NAME}") -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs}) target_link_libraries("${LIB_NAME}" pcl_common FLANN::FLANN pcl_octree pcl_kdtree) list(APPEND EXT_DEPS flann) diff --git a/segmentation/CMakeLists.txt b/segmentation/CMakeLists.txt index cb31b7bf16c..85b3f64be55 100644 --- a/segmentation/CMakeLists.txt +++ b/segmentation/CMakeLists.txt @@ -98,7 +98,6 @@ set(impl_incs ) set(LIB_NAME "pcl_${SUBSYS_NAME}") -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs}) target_link_libraries("${LIB_NAME}" pcl_search pcl_sample_consensus pcl_filters pcl_ml pcl_features) PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS}) diff --git a/simulation/CMakeLists.txt b/simulation/CMakeLists.txt index 1002f5d339f..0591f09f70c 100644 --- a/simulation/CMakeLists.txt +++ b/simulation/CMakeLists.txt @@ -30,8 +30,6 @@ set(incs ) set(LIB_NAME "pcl_${SUBSYS_NAME}") -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") - PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs}) target_link_libraries("${LIB_NAME}" pcl_common pcl_io diff --git a/stereo/CMakeLists.txt b/stereo/CMakeLists.txt index 5d980a327a3..566a06f5248 100644 --- a/stereo/CMakeLists.txt +++ b/stereo/CMakeLists.txt @@ -32,7 +32,6 @@ set(srcs ) set(LIB_NAME "pcl_${SUBSYS_NAME}") -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs}) target_link_libraries("${LIB_NAME}" pcl_common) PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS}) diff --git a/surface/CMakeLists.txt b/surface/CMakeLists.txt index 4536cbbe1eb..8f0760a84ab 100644 --- a/surface/CMakeLists.txt +++ b/surface/CMakeLists.txt @@ -174,11 +174,6 @@ set(impl_incs ) set(LIB_NAME "pcl_${SUBSYS_NAME}") - -include_directories( - "${CMAKE_CURRENT_SOURCE_DIR}/include" - "${CMAKE_CURRENT_SOURCE_DIR}" -) PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs} ${VTK_SMOOTHING_INCLUDES} ${POISSON_INCLUDES} ${OPENNURBS_INCLUDES} ${ON_NURBS_INCLUDES}) target_link_libraries("${LIB_NAME}" pcl_common pcl_search pcl_kdtree pcl_octree ${ON_NURBS_LIBRARIES}) @@ -191,7 +186,6 @@ if(VTK_FOUND) VTK::FiltersModeling VTK::FiltersCore) else() - include_directories(SYSTEM ${VTK_INCLUDE_DIRS}) link_directories(${VTK_LIBRARY_DIRS}) target_link_libraries("${LIB_NAME}" vtkCommonCore diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 5a489065e58..c47ba3b837d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -12,6 +12,7 @@ find_package(GTestSource REQUIRED) include_directories(SYSTEM ${GTEST_INCLUDE_DIRS} ${GTEST_SRC_DIR}) add_library(pcl_gtest STATIC ${GTEST_SRC_DIR}/src/gtest-all.cc) +target_include_directories(pcl_gtest PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) enable_testing() @@ -41,8 +42,6 @@ add_custom_target(tests "${CMAKE_CTEST_COMMAND}" ${PCL_CTEST_ARGUMENTS} -V -T Te set_target_properties(tests PROPERTIES FOLDER "Tests") -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") - add_subdirectory(2d) add_subdirectory(common) add_subdirectory(features) diff --git a/test/io/CMakeLists.txt b/test/io/CMakeLists.txt index 16546ecb189..3b0f90546ea 100644 --- a/test/io/CMakeLists.txt +++ b/test/io/CMakeLists.txt @@ -41,7 +41,6 @@ PCL_ADD_TEST(io_ply_io test_ply_io # Uses VTK readers to verify if(VTK_FOUND AND NOT ANDROID) - include_directories(SYSTEM ${VTK_INCLUDE_DIRS}) PCL_ADD_TEST (io_ply_mesh_io test_ply_mesh_io FILES test_ply_mesh_io.cpp LINK_WITH pcl_gtest pcl_io diff --git a/test/outofcore/CMakeLists.txt b/test/outofcore/CMakeLists.txt index 7a6cb9323e4..7ce9303bcd2 100644 --- a/test/outofcore/CMakeLists.txt +++ b/test/outofcore/CMakeLists.txt @@ -10,7 +10,6 @@ if(NOT build) return() endif() -include_directories(SYSTEM ${VTK_INCLUDE_DIRS}) PCL_ADD_TEST (outofcore_test test_outofcore FILES test_outofcore.cpp LINK_WITH pcl_gtest pcl_common pcl_io pcl_filters pcl_outofcore pcl_visualization) diff --git a/test/people/CMakeLists.txt b/test/people/CMakeLists.txt index 6c3840df5c0..d920a36bf47 100644 --- a/test/people/CMakeLists.txt +++ b/test/people/CMakeLists.txt @@ -10,7 +10,6 @@ if(NOT build) return() endif() -include_directories(SYSTEM ${VTK_INCLUDE_DIRS}) PCL_ADD_TEST(a_people_detection_test test_people_detection FILES test_people_groundBasedPeopleDetectionApp.cpp LINK_WITH pcl_gtest pcl_common pcl_io pcl_kdtree pcl_search pcl_features pcl_sample_consensus pcl_filters pcl_segmentation pcl_people diff --git a/tracking/CMakeLists.txt b/tracking/CMakeLists.txt index 78109d9724d..cd1fb8777a8 100644 --- a/tracking/CMakeLists.txt +++ b/tracking/CMakeLists.txt @@ -51,7 +51,6 @@ set(impl_incs ) set(LIB_NAME "pcl_${SUBSYS_NAME}") -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs}) target_link_libraries("${LIB_NAME}" pcl_common pcl_kdtree pcl_search pcl_filters pcl_octree) PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS}) diff --git a/visualization/CMakeLists.txt b/visualization/CMakeLists.txt index a629b4cc897..8446cb4f31d 100644 --- a/visualization/CMakeLists.txt +++ b/visualization/CMakeLists.txt @@ -11,9 +11,6 @@ if(ANDROID) endif() if(OPENGL_FOUND) - if(OPENGL_INCLUDE_DIR) - include_directories(SYSTEM "${OPENGL_INCLUDE_DIR}") - endif() if(OPENGL_DEFINITIONS) add_definitions("${OPENGL_DEFINITIONS}") endif() @@ -138,11 +135,6 @@ endif() set(LIB_NAME "pcl_${SUBSYS_NAME}") PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${common_incs} ${impl_incs} ${common_impl_incs} ${vtk_incs}) -target_include_directories(${LIB_NAME} PUBLIC - $ - $ -) - # apple workaround (continued) if(APPLE) target_link_libraries("${LIB_NAME}" "-framework Cocoa")