Skip to content

Commit 83d3ba5

Browse files
larshgmvieth
andauthored
Changes to tools (#5605)
* Move IO tools to tools folder. * Made all dependencies optional and build tools if requirements are met. * Fix opnni_viewer_simple * Satisfy clang-tidy * Make io hard-dependency. * Link pcl_common to pcl_io_ply. * Fix includes from pcl_common. * Remove check for pcl_io target. Move tools under if target pcl_recognition. Move tools under other if, having nested if instead of multiple conditions in ifs. * More reorganizing due to dependencies. * Fixup remove boost. * Fix missing TARGET keyword Co-authored-by: Markus Vieth <39675748+mvieth@users.noreply.github.com> --------- Co-authored-by: Markus Vieth <39675748+mvieth@users.noreply.github.com>
1 parent ad56383 commit 83d3ba5

18 files changed

+288
-254
lines changed

common/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,13 @@ set(kissfft_srcs
172172
)
173173

174174
set(LIB_NAME "pcl_${SUBSYS_NAME}")
175-
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
176175
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})
177176

177+
target_include_directories(${LIB_NAME} PUBLIC
178+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
179+
$<INSTALL_INTERFACE:include>
180+
)
181+
178182
target_link_libraries(${LIB_NAME} Boost::boost)
179183

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

io/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ if(MINGW)
211211
endif()
212212
PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/ply" ${PLY_INCLUDES})
213213
target_include_directories(pcl_io_ply PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
214-
target_link_libraries(pcl_io_ply Boost::boost)
214+
target_link_libraries(pcl_io_ply pcl_common Boost::boost)
215215

216216
set(srcs
217217
src/debayer.cpp
@@ -440,7 +440,3 @@ PCL_ADD_INCLUDES("${SUBSYS_NAME}" compression ${compression_incs})
440440
PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/openni_camera" ${OPENNI_INCLUDES})
441441
PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/openni2" ${OPENNI2_INCLUDES})
442442
PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/impl" ${impl_incs})
443-
444-
if(BUILD_tools)
445-
add_subdirectory(tools)
446-
endif()

io/tools/CMakeLists.txt

Lines changed: 0 additions & 28 deletions
This file was deleted.

io/tools/ply/CMakeLists.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.

tools/CMakeLists.txt

Lines changed: 264 additions & 197 deletions
Large diffs are not rendered by default.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)