diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2020-08-31 22:36:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 22:36:25 -0700 |
| commit | 46e25a10d7295d3bc107d6f51ce0e2851877f393 (patch) | |
| tree | eaceaf631ad478dbdc584332a7541cd40bc22449 /ports/behaviortree-cpp | |
| parent | cdd4a988fdf867d3c6dba43fd3924c5188de18bd (diff) | |
| download | vcpkg-46e25a10d7295d3bc107d6f51ce0e2851877f393.tar.gz vcpkg-46e25a10d7295d3bc107d6f51ce0e2851877f393.zip | |
[vcpkg] Replace uses of msys pacman.exe with direct package downloads (#13019)
* wip
Apply suggestions from code review
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
* [vcpkg_acquire_msys] Trim list of packages. Introduce defaults.
* [behaviortree-cpp] Fix dynamic dependency on ZMQ
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/behaviortree-cpp')
| -rw-r--r-- | ports/behaviortree-cpp/portfile.cmake | 28 | ||||
| -rw-r--r-- | ports/behaviortree-cpp/vcpkg.json | 2 |
2 files changed, 9 insertions, 21 deletions
diff --git a/ports/behaviortree-cpp/portfile.cmake b/ports/behaviortree-cpp/portfile.cmake index b689ab480..f67153766 100644 --- a/ports/behaviortree-cpp/portfile.cmake +++ b/ports/behaviortree-cpp/portfile.cmake @@ -20,35 +20,23 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
+ -DCMAKE_DISABLE_FIND_PACKAGE_ament_cmake=1
+ -DCMAKE_DISABLE_FIND_PACKAGE_Curses=1
-DBUILD_EXAMPLES=OFF
-DBUILD_UNIT_TESTS=OFF
-DBUILD_TOOLS=OFF
)
vcpkg_install_cmake()
-
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/BehaviorTreeV3/cmake TARGET_PATH share/behaviortreev3)
vcpkg_copy_pdbs()
-set(TOOLS bt3_log_cat bt3_plugin_manifest)
-
-foreach(tool ${TOOLS})
- set(suffix ${VCPKG_TARGET_EXECUTABLE_SUFFIX})
- if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${suffix}")
- file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${suffix}")
- endif()
- if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}")
- file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}"
- DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
- file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}")
- endif()
-endforeach()
-
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE
+ "${CURRENT_PACKAGES_DIR}/debug/include"
+ "${CURRENT_PACKAGES_DIR}/lib/BehaviorTreeV3"
+ "${CURRENT_PACKAGES_DIR}/debug/lib/BehaviorTreeV3"
+)
vcpkg_test_cmake(PACKAGE_NAME BehaviorTreeV3)
diff --git a/ports/behaviortree-cpp/vcpkg.json b/ports/behaviortree-cpp/vcpkg.json index 97731b09c..783187faa 100644 --- a/ports/behaviortree-cpp/vcpkg.json +++ b/ports/behaviortree-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "behaviortree-cpp", "version-string": "3.5.1", - "port-version": 1, + "port-version": 2, "description": "Behavior Trees Library in C++.", "homepage": "https://www.behaviortree.dev", "supports": "!uwp & !osx", |