Skip to content

Move outofcore tools to tools folder. #5606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −35
Open

Move outofcore tools to tools folder. #5606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions outofcore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,16 @@ 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_include_directories(${LIB_NAME}
PUBLIC
$<INSTALL_INTERFACE:include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
)

target_link_libraries("${LIB_NAME}" pcl_common pcl_visualization ${Boost_SYSTEM_LIBRARY})
PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS})

# Install include files
PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}" ${incs})
PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/impl" ${impl_incs})
PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/visualization" ${visualization_incs})

if(BUILD_tools)
add_subdirectory(tools)
endif()
30 changes: 0 additions & 30 deletions outofcore/tools/CMakeLists.txt
View file
Open in desktop

This file was deleted.

23 changes: 23 additions & 0 deletions tools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,29 @@ if(TARGET pcl_filters)
endif()
endif()

if(TARGET pcl_outofcore)
# pcl_outofcore_process
PCL_ADD_EXECUTABLE(pcl_outofcore_process COMPONENT ${SUBSYS_NAME} SOURCES outofcore_process.cpp)
target_link_libraries(pcl_outofcore_process pcl_common pcl_io pcl_octree pcl_filters pcl_outofcore)

PCL_ADD_EXECUTABLE(pcl_outofcore_print COMPONENT ${SUBSYS_NAME} SOURCES outofcore_print.cpp)
target_link_libraries(pcl_outofcore_print pcl_common pcl_io pcl_octree pcl_filters pcl_outofcore)

if(TARGET pcl_visualization)
set(srcs outofcore_viewer.cpp
../outofcore/src/visualization/camera.cpp
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't like the idea of using/referring to files in another PCL module. However, it seems like the files in outofcore/src/visualization are only used by the outofcore_viewer, and not compiled into the outofcore module library? But on the other hand, the corresponding headers in outofcore/include/pcl/outofcore/visualization are installed as if the outofcore module library contained all the stuff from the cpp files? Unfortunately I don't have any experience with outofcore, so no idea how it is supposed to be.
Moving pcl_outofcore_process and pcl_outofcore_print seems unproblematic, so that's fine by me

../outofcore/src/visualization/common.cpp
../outofcore/src/visualization/object.cpp
../outofcore/src/visualization/grid.cpp
../outofcore/src/visualization/outofcore_cloud.cpp
../outofcore/src/visualization/scene.cpp
../outofcore/src/visualization/viewport.cpp)
# pcl_outofcore_viewer
PCL_ADD_EXECUTABLE(pcl_outofcore_viewer COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} BUNDLE)
target_link_libraries(pcl_outofcore_viewer pcl_common pcl_io pcl_octree pcl_filters pcl_outofcore pcl_visualization)
endif()
endif()

if(TARGET pcl_visualization)
PCL_ADD_EXECUTABLE(pcl_octree_viewer COMPONENT ${SUBSYS_NAME} SOURCES octree_viewer.cpp)
target_link_libraries(pcl_octree_viewer pcl_common pcl_io pcl_octree pcl_kdtree pcl_filters pcl_visualization)
Expand Down
0 outofcore/tools/outofcore_print.cpp → tools/outofcore_print.cpp
View file
Open in desktop
File renamed without changes.
0 outofcore/tools/outofcore_process.cpp → tools/outofcore_process.cpp
View file
Open in desktop
File renamed without changes.
0 outofcore/tools/outofcore_viewer.cpp → tools/outofcore_viewer.cpp
View file
Open in desktop
File renamed without changes.