Skip to content
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

merge pcl_io_ply into pcl_io to resolve #4422 #5628

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

merge pcl_io_ply into pcl_io to resolve #4422 #5628

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25f22ae
merge pcl_io_ply into pcl_io to resolve #4422
miriameng Mar 6, 2023
a9543ac
put PLY_SOURCES and PLY_INCLUDES in srcs and incs
miriameng Mar 12, 2023
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
13 changes: 3 additions & 10 deletions io/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,15 +204,6 @@ set(PLY_INCLUDES
"include/pcl/${SUBSYS_NAME}/ply/ply_parser.h"
)

PCL_ADD_LIBRARY(pcl_io_ply COMPONENT ${SUBSYS_NAME} SOURCES ${PLY_SOURCES} ${PLY_INCLUDES})
if(MINGW)
# libws2_32 isn't added by default for 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
src/debayer.cpp
src/pcd_grabber.cpp
Expand Down Expand Up @@ -242,6 +233,7 @@ set(srcs
${DSSDK_GRABBER_SOURCES}
${RSSDK_GRABBER_SOURCES}
${RSSDK2_GRABBER_SOURCES}
${PLY_SOURCES}
)

if(PNG_FOUND)
Expand Down Expand Up @@ -295,6 +287,7 @@ set(incs
${DSSDK_GRABBER_INCLUDES}
${RSSDK_GRABBER_INCLUDES}
${RSSDK2_GRABBER_INCLUDES}
${PLY_INCLUDES}
)

set(compression_incs
Expand Down Expand Up @@ -343,7 +336,7 @@ PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${c

target_include_directories(${LIB_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")

target_link_libraries("${LIB_NAME}" Boost::boost Boost::filesystem Boost::iostreams pcl_common pcl_io_ply)
target_link_libraries("${LIB_NAME}" Boost::boost Boost::filesystem Boost::iostreams pcl_common)

if(VTK_FOUND)
if(${VTK_VERSION} VERSION_GREATER_EQUAL 9.0)
Expand Down