From 76193ab5ed324cc3e22aba2891bc08cdeed4da39 Mon Sep 17 00:00:00 2001 From: Tobias Kohlbau Date: Wed, 29 Mar 2017 13:18:28 +0200 Subject: [PATCH 1/2] [octomap] adds port for octomap Adds port for octomap within vcpkg. In the development branch many CMake related changes occured since 1.8.1 which are quite comfortable for vcpkg integration. Due to this fact for the moment this package is based on commit cefed0c1d79afafa5aeb05273cf1246b093b771c an should be migrated to the next stable version shortly after release. Signed-off-by: Tobias Kohlbau --- ports/octomap/CONTROL | 3 +++ ports/octomap/portfile.cmake | 49 ++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 ports/octomap/CONTROL create mode 100644 ports/octomap/portfile.cmake diff --git a/ports/octomap/CONTROL b/ports/octomap/CONTROL new file mode 100644 index 00000000000..f5411266926 --- /dev/null +++ b/ports/octomap/CONTROL @@ -0,0 +1,3 @@ +Source: octomap +Version: cefed0c1d79afafa5aeb05273cf1246b093b771c-1 +Description: An Efficient Probabilistic 3D Mapping Framework Based on Octrees diff --git a/ports/octomap/portfile.cmake b/ports/octomap/portfile.cmake new file mode 100644 index 00000000000..1a6e48570f1 --- /dev/null +++ b/ports/octomap/portfile.cmake @@ -0,0 +1,49 @@ +include(vcpkg_common_functions) +set(GIT_REF "cefed0c1d79afafa5aeb05273cf1246b093b771c") +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/octomap-${GIT_REF}) +vcpkg_download_distfile(ARCHIVE + URLS "https://codeload.github.com/OctoMap/octomap/zip/${GIT_REF}" + FILENAME "octomap-${GIT_REF}.zip" + SHA512 0d470ea9929a80366314a6e99717f68f489e8b58f26ae79bd02b7c1a4f1d8ee64591d61d95154724caefc5a0b71e1dab96a1280d9ff927c6e4d854b25b509295 +) +vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS -DBUILD_OCTOVIS_SUBPROJECT=OFF -DBUILD_DYNAMICETD3D_SUBPROJECT=OFF -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON + # OPTIONS_RELEASE -DOPTIMIZE=1 + # OPTIONS_DEBUG -DDEBUGGABLE=1 +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/binvox2bt.exe ${CURRENT_PACKAGES_DIR}/tools/binvox2bt.exe) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/bt2vrml.exe ${CURRENT_PACKAGES_DIR}/tools/bt2vrml.exe) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/compare_octrees.exe ${CURRENT_PACKAGES_DIR}/tools/compare_octrees.exe) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/convert_octree.exe ${CURRENT_PACKAGES_DIR}/tools/convert_octree.exe) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/edit_octree.exe ${CURRENT_PACKAGES_DIR}/tools/edit_octree.exe) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/eval_octree_accuracy.exe ${CURRENT_PACKAGES_DIR}/tools/eval_octree_accuracy.exe) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/graph2tree.exe ${CURRENT_PACKAGES_DIR}/tools/graph2tree.exe) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/log2graph.exe ${CURRENT_PACKAGES_DIR}/tools/log2graph.exe) + +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/binvox2bt.exe) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bt2vrml.exe) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/compare_octrees.exe) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/convert_octree.exe) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/edit_octree.exe) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/eval_octree_accuracy.exe) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/graph2tree.exe) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/log2graph.exe) + +file(RENAME ${CURRENT_PACKAGES_DIR}/debug/share/octomap/octomap-targets-debug.cmake ${CURRENT_PACKAGES_DIR}/share/octomap/octomap-targets-debug.cmake) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) + +# Handle copyright +file(COPY ${SOURCE_PATH}/octomap/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/octomap) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/octomap/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/octomap/copyright) \ No newline at end of file From 9efcd6755e7fb65c97c9b56407e28c9d76441c77 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 29 Mar 2017 11:07:24 -0700 Subject: [PATCH 2/2] [octomap] Place tools in a subdirectory for copy_tool_dependencies. Copy pdbs. Fixup cmake targets. --- ports/octomap/portfile.cmake | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/ports/octomap/portfile.cmake b/ports/octomap/portfile.cmake index 1a6e48570f1..96b7a6386a3 100644 --- a/ports/octomap/portfile.cmake +++ b/ports/octomap/portfile.cmake @@ -19,15 +19,15 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/binvox2bt.exe ${CURRENT_PACKAGES_DIR}/tools/binvox2bt.exe) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/bt2vrml.exe ${CURRENT_PACKAGES_DIR}/tools/bt2vrml.exe) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/compare_octrees.exe ${CURRENT_PACKAGES_DIR}/tools/compare_octrees.exe) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/convert_octree.exe ${CURRENT_PACKAGES_DIR}/tools/convert_octree.exe) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/edit_octree.exe ${CURRENT_PACKAGES_DIR}/tools/edit_octree.exe) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/eval_octree_accuracy.exe ${CURRENT_PACKAGES_DIR}/tools/eval_octree_accuracy.exe) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/graph2tree.exe ${CURRENT_PACKAGES_DIR}/tools/graph2tree.exe) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/log2graph.exe ${CURRENT_PACKAGES_DIR}/tools/log2graph.exe) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/octomap) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/binvox2bt.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/binvox2bt.exe) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/bt2vrml.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/bt2vrml.exe) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/compare_octrees.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/compare_octrees.exe) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/convert_octree.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/convert_octree.exe) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/edit_octree.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/edit_octree.exe) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/eval_octree_accuracy.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/eval_octree_accuracy.exe) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/graph2tree.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/graph2tree.exe) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/log2graph.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/log2graph.exe) file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/binvox2bt.exe) file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bt2vrml.exe) @@ -38,7 +38,9 @@ file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/eval_octree_accuracy.exe) file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/graph2tree.exe) file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/log2graph.exe) -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/share/octomap/octomap-targets-debug.cmake ${CURRENT_PACKAGES_DIR}/share/octomap/octomap-targets-debug.cmake) +file(READ ${CURRENT_PACKAGES_DIR}/debug/share/octomap/octomap-targets-debug.cmake _contents) +string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" _contents "${_contents}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/octomap/octomap-targets-debug.cmake "${_contents}") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) @@ -46,4 +48,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) # Handle copyright file(COPY ${SOURCE_PATH}/octomap/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/octomap) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/octomap/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/octomap/copyright) \ No newline at end of file +file(RENAME ${CURRENT_PACKAGES_DIR}/share/octomap/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/octomap/copyright) + +vcpkg_copy_pdbs() +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/octomap) \ No newline at end of file