From a76ff5c303922974be2842e9f70d7df1705f3e99 Mon Sep 17 00:00:00 2001 From: Sebastian Hahta <joseha@utu.fi> Date: Fri, 3 May 2019 14:44:51 +0300 Subject: [PATCH] Add PCL to CMake files --- CMakeLists.txt | 3 +++ vision/CMakeLists.txt | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc83c57d6..39a54f772 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,8 +21,11 @@ find_package( Threads REQUIRED ) find_package( URIParser REQUIRED ) find_package( MsgPack REQUIRED ) find_package( LibSGM ) +find_package( PCL ) #find_package( ZLIB REQUIRED ) +set(CMAKE_CXX_STANDARD 17) # For PCL/VTK https://github.com/PointCloudLibrary/pcl/issues/2686 + # Readline library is not required on Windows # May also entirely remove dependence on this... it should be optional at least. if (NOT WIN32) diff --git a/vision/CMakeLists.txt b/vision/CMakeLists.txt index 5320fd283..3515efaa3 100644 --- a/vision/CMakeLists.txt +++ b/vision/CMakeLists.txt @@ -46,7 +46,11 @@ if (CUDA_FOUND) set_property(TARGET ftl-vision PROPERTY CUDA_SEPARABLE_COMPILATION ON) endif() +# TODO: move PCL stuff elsewhere +target_include_directories(ftl-vision PUBLIC ${PCL_INCLUDE_DIRS}) +target_compile_definitions(ftl-vision PUBLIC ${PCL_DEFINITIONS}) + #target_include_directories(cv-node PUBLIC ${PROJECT_SOURCE_DIR}/include) -target_link_libraries(ftl-vision ftlcommon ftlrender Threads::Threads libelas ${OpenCV_LIBS} ${LIBSGM_LIBRARIES} ${CUDA_LIBRARIES} glog::glog ftlnet) +target_link_libraries(ftl-vision ftlcommon ftlrender Threads::Threads libelas ${OpenCV_LIBS} ${LIBSGM_LIBRARIES} ${CUDA_LIBRARIES} glog::glog ftlnet ${PCL_LIBRARIES}) -- GitLab