From 5b2d824a2ed857c63ef1c692aee35af708bbc2dc Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Sat, 7 Nov 2020 05:20:47 +0800 Subject: [vcpkg baseline][rtabmap] Fix dependency issue when build tools (#14426) * [vcpkg baseline][rtabmap] Fix dependency issue when build tools * Format vcpkg.json * Fix copy tools --- ports/rtabmap/portfile.cmake | 17 ++++++++++++++--- ports/rtabmap/vcpkg.json | 10 +++++++++- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/ports/rtabmap/portfile.cmake b/ports/rtabmap/portfile.cmake index 4a798b49e..e51690c4e 100644 --- a/ports/rtabmap/portfile.cmake +++ b/ports/rtabmap/portfile.cmake @@ -10,10 +10,17 @@ vcpkg_from_github( 001_opencv.patch ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + tools BUILD_TOOLS +) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_APP=OFF + -DBUILD_EXAMPLES=OFF -DWITH_QT=OFF -DWITH_SUPERPOINT_TORCH=OFF -DWITH_PYMATCHER=OFF @@ -53,7 +60,10 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -vcpkg_copy_tools( +vcpkg_copy_tools(TOOL_NAMES rtabmap-res_tool AUTO_CLEAN) + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools( TOOL_NAMES rtabmap-camera rtabmap-console @@ -65,10 +75,11 @@ vcpkg_copy_tools( rtabmap-recovery rtabmap-report rtabmap-reprocess - rtabmap-res_tool rtabmap-rgbd_dataset + rtabmap-euroc_dataset AUTO_CLEAN -) + ) +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" diff --git a/ports/rtabmap/vcpkg.json b/ports/rtabmap/vcpkg.json index be7d89246..ef458fd62 100644 --- a/ports/rtabmap/vcpkg.json +++ b/ports/rtabmap/vcpkg.json @@ -9,5 +9,13 @@ "opencv", "pcl", "zlib" - ] + ], + "features": { + "tools": { + "description": "Build tools", + "dependencies": [ + "yaml-cpp" + ] + } + } } -- cgit v1.2.3