aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-03-29 11:07:24 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-03-29 11:07:24 -0700
commit9efcd6755e7fb65c97c9b56407e28c9d76441c77 (patch)
tree504756c33f6d979e8583a0eb0d622bf2b77eebe4
parent76193ab5ed324cc3e22aba2891bc08cdeed4da39 (diff)
downloadvcpkg-9efcd6755e7fb65c97c9b56407e28c9d76441c77.tar.gz
vcpkg-9efcd6755e7fb65c97c9b56407e28c9d76441c77.zip
[octomap] Place tools in a subdirectory for copy_tool_dependencies. Copy pdbs. Fixup cmake targets.
-rw-r--r--ports/octomap/portfile.cmake27
1 files changed, 16 insertions, 11 deletions
diff --git a/ports/octomap/portfile.cmake b/ports/octomap/portfile.cmake
index 1a6e48570..96b7a6386 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