-
Notifications
You must be signed in to change notification settings - Fork 6.6k
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.
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
[behaviortree-cpp] Add new port #12769
Merged
BillyONeal
merged 11 commits into
microsoft:master
from
seanyen:seanyen/behaviortree.cpp
Aug 21, 2020
Merged
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
91e96f3
adding behaviortree-cpp.
seanyen c9797c7
lint fix.
seanyen 63226ca
fix.
seanyen 16b1f7e
Adding baseline.
seanyen d82fc88
Update ports/behaviortree-cpp/vcpkg.json
seanyen a2e1f88
Update scripts/ci.baseline.txt
seanyen 8f9cd2e
Update ports/behaviortree-cpp/001_port_fixes.patch
strega-nil a7f61df
Adding missing dep.
seanyen 7177002
Update ci.baseline.txt
seanyen a334a28
Update vcpkg.json
seanyen 75acb6c
Update vcpkg.json
seanyen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 /wd4702) | ||
| else() | ||
| target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE | ||
| -Wall -Wextra -Werror=return-type) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "name": "behaviortree-cpp", | ||
| "version-string": "3.5.1", | ||
| "description": "Behavior Trees Library in C++.", | ||
| "homepage": "https://www.behaviortree.dev", | ||
| "supports": "!uwp", | ||
| "dependencies": [ | ||
| "boost-coroutine2" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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"?
There was a problem hiding this comment.
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&!osxand this item be removed from the baseline.There was a problem hiding this comment.
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. :)