Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[behaviortree-cpp] Add new port #12769

Merged
merged 11 commits into from
Aug 21, 2020
Merged

[behaviortree-cpp] Add new port #12769

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
91e96f3
adding behaviortree-cpp.
seanyen Aug 5, 2020
c9797c7
lint fix.
seanyen Aug 5, 2020
63226ca
fix.
seanyen Aug 5, 2020
16b1f7e
Adding baseline.
seanyen Aug 6, 2020
d82fc88
Update ports/behaviortree-cpp/vcpkg.json
seanyen Aug 7, 2020
a2e1f88
Update scripts/ci.baseline.txt
seanyen Aug 7, 2020
8f9cd2e
Update ports/behaviortree-cpp/001_port_fixes.patch
strega-nil Aug 10, 2020
a7f61df
Adding missing dep.
seanyen Aug 11, 2020
7177002
Update ci.baseline.txt
seanyen Aug 21, 2020
a334a28
Update vcpkg.json
seanyen Aug 21, 2020
75acb6c
Update vcpkg.json
seanyen Aug 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ports/behaviortree-cpp/001_port_fixes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75dea11..4eea781 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,7 +229,7 @@ if( ZMQ_FOUND )
endif()

if(MSVC)
- target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE /W4 /WX)
+ target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE /W4 /WX /wd4702)
strega-nil marked this conversation as resolved.
Show resolved Hide resolved
else()
target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE
-Wall -Wextra -Werror=return-type)
49 changes: 49 additions & 0 deletions ports/behaviortree-cpp/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
vcpkg_fail_port_install(ON_TARGET "UWP")

vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/BehaviorTree/BehaviorTree.CPP/archive/3.5.1.tar.gz"
FILENAME "BehaviorTree.CPP.3.5.1.tar.gz"
SHA512 66db43225e692fa0f9073e63bdff765c037440372478792a9b442103a8bed945f5c3ae1d66266b86cb41d0006404a8297708a799ec0c7286c2beec6f964a4ac6
)

vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
PATCHES
001_port_fixes.patch
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
)

vcpkg_install_cmake()

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")

vcpkg_test_cmake(PACKAGE_NAME BehaviorTreeV3)
6 changes: 6 additions & 0 deletions ports/behaviortree-cpp/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "behaviortree-cpp",
"version-string": "3.5.1",
"description": "Behavior Trees Library in C++.",
"homepage": "https://www.behaviortree.dev"
seanyen marked this conversation as resolved.
Show resolved Hide resolved
}
3 changes: 3 additions & 0 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ bde:x64-uwp=fail
bde:x64-windows=fail
bde:x64-windows-static=fail
bde:x86-windows=fail
behaviortree-cpp:arm-uwp=fail
behaviortree-cpp:x64-osx=fail
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the port doesn't support osx perhaps it should be excluded in "Supports"?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, I think the supports should be changed to !uwp&!osx and this item be removed from the baseline.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BillyONeal I updated the "Supports" part. Let's see how the CI goes. :)

behaviortree-cpp:x64-uwp=fail
seanyen marked this conversation as resolved.
Show resolved Hide resolved
benchmark:arm64-windows=fail
benchmark:arm-uwp=fail
benchmark:x64-uwp=fail
Expand Down