From 181bc42d8cd1bdb49e91407305d0833f7fb38e08 Mon Sep 17 00:00:00 2001 From: Serafadam Date: Wed, 13 Mar 2024 12:14:24 +0000 Subject: [PATCH 1/5] fix finding jsoncpp --- cmake/depthaiDependencies.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/depthaiDependencies.cmake b/cmake/depthaiDependencies.cmake index abff1f6f3..e398023a8 100644 --- a/cmake/depthaiDependencies.cmake +++ b/cmake/depthaiDependencies.cmake @@ -76,8 +76,9 @@ endif() # OpenCV 4 - (optional, quiet always) find_package(OpenCV 4 QUIET CONFIG) - -find_package(jsoncpp QUIET) +if(NOT TARGET JsonCpp::JsonCpp) + find_package(jsoncpp QUIET) +endif() set(MODULE_TEMP ${CMAKE_MODULE_PATH}) set(PREFIX_TEMP ${CMAKE_PREFIX_PATH}) set(CMAKE_MODULE_PATH ${_DEPTHAI_MODULE_PATH_ORIGINAL}) From e3ea20d436dd9d19323feec48ef9faee1fa1baf5 Mon Sep 17 00:00:00 2001 From: Matevz Morato Date: Mon, 15 Apr 2024 12:07:51 +0200 Subject: [PATCH 2/5] Add jsoncpp with hunter --- cmake/depthaiDependencies.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/depthaiDependencies.cmake b/cmake/depthaiDependencies.cmake index e398023a8..b6e26e558 100644 --- a/cmake/depthaiDependencies.cmake +++ b/cmake/depthaiDependencies.cmake @@ -22,6 +22,7 @@ else() hunter_add_package(Backward) endif() hunter_add_package(libnop) + hunter_add_package(jsoncpp) endif() # If library was build as static, find all dependencies From 58a0b81b71ae09f977c256dbabcf6c249feec5d8 Mon Sep 17 00:00:00 2001 From: asahtik Date: Mon, 15 Apr 2024 13:07:30 +0200 Subject: [PATCH 3/5] Make PCL include optional --- CMakeLists.txt | 2 +- cmake/depthaiDependencies.cmake | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 184a680de..d3819db63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -302,7 +302,7 @@ option(DEPTHAI_BUILD_TESTS "Build tests" OFF) option(DEPTHAI_BUILD_EXAMPLES "Build examples - Requires OpenCV library to be installed" OFF) option(DEPTHAI_BUILD_DOCS "Build documentation - requires doxygen to be installed" OFF) option(DEPTHAI_OPENCV_SUPPORT "Enable optional OpenCV support" ON) -option(DEPTHAI_PCL_SUPPORT "Enable optional PCL support" ON) +option(DEPTHAI_PCL_SUPPORT "Enable optional PCL support" OFF) option(DEPTHAI_BINARIES_RESOURCE_COMPILE "Compile Depthai device side binaries into library" ON) diff --git a/cmake/depthaiDependencies.cmake b/cmake/depthaiDependencies.cmake index b6e26e558..e150b05de 100644 --- a/cmake/depthaiDependencies.cmake +++ b/cmake/depthaiDependencies.cmake @@ -77,14 +77,16 @@ endif() # OpenCV 4 - (optional, quiet always) find_package(OpenCV 4 QUIET CONFIG) -if(NOT TARGET JsonCpp::JsonCpp) +if(DEPTHAI_PCL_SUPPORT AND NOT TARGET JsonCpp::JsonCpp) find_package(jsoncpp QUIET) endif() set(MODULE_TEMP ${CMAKE_MODULE_PATH}) set(PREFIX_TEMP ${CMAKE_PREFIX_PATH}) set(CMAKE_MODULE_PATH ${_DEPTHAI_MODULE_PATH_ORIGINAL}) set(CMAKE_PREFIX_PATH ${_DEPTHAI_PREFIX_PATH_ORIGINAL}) -find_package(PCL QUIET CONFIG COMPONENTS common visualization) +if(DEPTHAI_PCL_SUPPORT) + find_package(PCL QUIET CONFIG COMPONENTS common visualization) +endif() set(CMAKE_MODULE_PATH ${MODULE_TEMP}) set(CMAKE_PREFIX_PATH ${PREFIX_TEMP}) From 5a863070011ae2ceb50a1c7cf11cda9d661f584f Mon Sep 17 00:00:00 2001 From: asahtik Date: Mon, 15 Apr 2024 13:45:11 +0200 Subject: [PATCH 4/5] Fail loudly if PCL enabled, README changes --- README.md | 1 + cmake/depthaiDependencies.cmake | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4087e2945..cfc74f3d9 100644 --- a/README.md +++ b/README.md @@ -194,6 +194,7 @@ The following environment variables can be set to alter default behavior of the | DEPTHAI_LIBUSB_ANDROID_JAVAVM | JavaVM pointer that is passed to libusb for rootless Android interaction with devices. Interpreted as decimal value of uintptr_t | | DEPTHAI_CRASHDUMP | Directory in which to save the crash dump. | | DEPTHAI_CRASHDUMP_TIMEOUT | Specifies the duration in seconds to wait for device reboot when obtaining a crash dump. Crash dump retrieval disabled if 0. | +| DEPTHAI_PCL_SUPPORT | Enables PCL support. | ## Running tests diff --git a/cmake/depthaiDependencies.cmake b/cmake/depthaiDependencies.cmake index e150b05de..75ea180d7 100644 --- a/cmake/depthaiDependencies.cmake +++ b/cmake/depthaiDependencies.cmake @@ -78,14 +78,14 @@ endif() # OpenCV 4 - (optional, quiet always) find_package(OpenCV 4 QUIET CONFIG) if(DEPTHAI_PCL_SUPPORT AND NOT TARGET JsonCpp::JsonCpp) - find_package(jsoncpp QUIET) + find_package(jsoncpp) endif() set(MODULE_TEMP ${CMAKE_MODULE_PATH}) set(PREFIX_TEMP ${CMAKE_PREFIX_PATH}) set(CMAKE_MODULE_PATH ${_DEPTHAI_MODULE_PATH_ORIGINAL}) set(CMAKE_PREFIX_PATH ${_DEPTHAI_PREFIX_PATH_ORIGINAL}) if(DEPTHAI_PCL_SUPPORT) - find_package(PCL QUIET CONFIG COMPONENTS common visualization) + find_package(PCL CONFIG COMPONENTS common visualization) endif() set(CMAKE_MODULE_PATH ${MODULE_TEMP}) set(CMAKE_PREFIX_PATH ${PREFIX_TEMP}) From 8020e0f736b3a2b26a165308828adcc7c8362443 Mon Sep 17 00:00:00 2001 From: Matevz Morato Date: Mon, 15 Apr 2024 15:34:40 +0200 Subject: [PATCH 5/5] Conditionally add jsoncpp package --- cmake/depthaiDependencies.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/depthaiDependencies.cmake b/cmake/depthaiDependencies.cmake index 75ea180d7..9be00b7f6 100644 --- a/cmake/depthaiDependencies.cmake +++ b/cmake/depthaiDependencies.cmake @@ -22,7 +22,9 @@ else() hunter_add_package(Backward) endif() hunter_add_package(libnop) - hunter_add_package(jsoncpp) + if(DEPTHAI_PCL_SUPPORT) + hunter_add_package(jsoncpp) + endif() endif() # If library was build as static, find all dependencies