Skip to content

Commit

Permalink
Merge branch 'mpeg-112' of https://github.com/RufaelDev/pcc-mp3dg int…
Browse files Browse the repository at this point in the history
…o kees-adaptMacLinux
  • Loading branch information
Kees Blom committed Jun 17, 2015
2 parents 1e27eaf + 3483afa commit 10067dc
Show file tree
Hide file tree
Showing 17 changed files with 3,218 additions and 2,291 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Expand Up @@ -298,6 +298,7 @@ option(WITH_JPEG "Build with JPEG support" TRUE)
if(WITH_JPEG)
find_package(JPEG)
if (JPEG_FOUND)
message("mp3dg jpeg found, havejpeg is on")
set(HAVE_JPEG ON)
endif(JPEG_FOUND)
endif(WITH_JPEG)
Expand Down
8 changes: 6 additions & 2 deletions cloud_codec_v2/CMakeLists.txt
@@ -1,6 +1,6 @@
set(SUBSYS_NAME cloud_codec_v2)
set(SUBSYS_DESC "Extensions for Point Cloud Compression for MPEG")
set(SUBSYS_DEPS common sample_consensus search kdtree octree filters features io geometry visualization registration quality)
set(SUBSYS_DEPS common sample_consensus search kdtree octree filters features io geometry registration quality)

set(build TRUE)
PCL_SUBSYS_OPTION(build "${SUBSYS_NAME}" "${SUBSYS_DESC}" ON)
Expand All @@ -19,10 +19,14 @@ if(build)
"include/pcl/${SUBSYS_NAME}/color_coding_jpeg.h"
"include/pcl/${SUBSYS_NAME}/snake_grid_mapping.h"
"include/pcl/${SUBSYS_NAME}/color_coding_jpeg.h"
"include/pcl/${SUBSYS_NAME}/quaternion_coding.h"
"include/pcl/${SUBSYS_NAME}/rigid_transform_coding.h"
)

set(impl_incs
"include/pcl/${SUBSYS_NAME}/impl/point_cloud_codec_v2_impl.hpp"
"include/pcl/${SUBSYS_NAME}/impl/quaternion_coding_impl.hpp"
"include/pcl/${SUBSYS_NAME}/impl/rigid_transform_coding_impl.hpp"
)

if(WITH_JPEG)
Expand All @@ -34,7 +38,7 @@ if(build)
set(LIB_NAME "pcl_${SUBSYS_NAME}")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
PCL_ADD_LIBRARY("${LIB_NAME}" "${SUBSYS_NAME}" ${srcs} ${incs} ${impl_incs})
target_link_libraries("${LIB_NAME}" pcl_common pcl_sample_consensus pcl_search pcl_kdtree pcl_octree pcl_io pcl_io_ply pcl_visualization pcl_registration)
target_link_libraries("${LIB_NAME}" pcl_common pcl_sample_consensus pcl_search pcl_kdtree pcl_octree pcl_io pcl_io_ply pcl_registration)
PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}" "${SUBSYS_DEPS}" "" "" "" "")

# Install include files
Expand Down

0 comments on commit 10067dc

Please sign in to comment.