diff options
| author | markdegreef <mgreef@gmail.com> | 2019-04-02 07:00:12 +0200 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-04-01 22:00:12 -0700 |
| commit | d1110ceb7feb527ac58f274239d435e32dca4b84 (patch) | |
| tree | ff5007ca074de50daa12852b5aaafa5607bb167c | |
| parent | 575df0550cefa72e4e5280337770d2ba5079db91 (diff) | |
| download | vcpkg-d1110ceb7feb527ac58f274239d435e32dca4b84.tar.gz vcpkg-d1110ceb7feb527ac58f274239d435e32dca4b84.zip | |
[octomap] fix linux build (#5583)
* [octomap] fix linux build
Copy entire bin folder for linux, as it only contains the executables
* [octomap] remove debug binaries
| -rw-r--r-- | ports/octomap/CONTROL | 2 | ||||
| -rw-r--r-- | ports/octomap/portfile.cmake | 39 |
2 files changed, 23 insertions, 18 deletions
diff --git a/ports/octomap/CONTROL b/ports/octomap/CONTROL index 21c72834f..f6633ea07 100644 --- a/ports/octomap/CONTROL +++ b/ports/octomap/CONTROL @@ -1,3 +1,3 @@ Source: octomap -Version: cefed0c1d79afafa5aeb05273cf1246b093b771c-3 +Version: cefed0c1d79afafa5aeb05273cf1246b093b771c-4 Description: An Efficient Probabilistic 3D Mapping Framework Based on Octrees diff --git a/ports/octomap/portfile.cmake b/ports/octomap/portfile.cmake index e07551dbe..5155c31bb 100644 --- a/ports/octomap/portfile.cmake +++ b/ports/octomap/portfile.cmake @@ -25,23 +25,28 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) 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) -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) +if(WIN32) + 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) + 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) +else() + file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/octomap) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() vcpkg_fixup_cmake_targets(CONFIG_PATH share/octomap) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) |