diff options
| author | JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> | 2021-04-10 00:42:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-09 09:42:55 -0700 |
| commit | 5f32ae982d2b417fe0556248e2243fe267d8fe9d (patch) | |
| tree | 4d1b0e4d4b934913a44f7cfd6be00b6299b0edce /ports/behaviortree-cpp/002_fix_dependencies.patch | |
| parent | c73daaa91fe6a6ddd593251b337f32090fa39aa1 (diff) | |
| download | vcpkg-5f32ae982d2b417fe0556248e2243fe267d8fe9d.tar.gz vcpkg-5f32ae982d2b417fe0556248e2243fe267d8fe9d.zip | |
[behaviortree-cpp] update to 3.5.6 (#17169)
* [behaviortree-cpp] update to 3.5.6
* update version
* update vcpkg.json
* update version
Diffstat (limited to 'ports/behaviortree-cpp/002_fix_dependencies.patch')
| -rw-r--r-- | ports/behaviortree-cpp/002_fix_dependencies.patch | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ports/behaviortree-cpp/002_fix_dependencies.patch b/ports/behaviortree-cpp/002_fix_dependencies.patch index 76d7857db..d554e37ce 100644 --- a/ports/behaviortree-cpp/002_fix_dependencies.patch +++ b/ports/behaviortree-cpp/002_fix_dependencies.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 75dea11..23053ca 100644
+index 658f994..a04cf27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ if(MSVC)
@@ -8,27 +8,26 @@ index 75dea11..23053ca 100644 #---- Include boost to add coroutines ----
-find_package(Boost COMPONENTS coroutine QUIET)
+find_package(Boost REQUIRED) # coroutine2 is header-only
+
if(Boost_FOUND)
- include_directories(${Boost_INCLUDE_DIRS})
string(REPLACE "." "0" Boost_VERSION_NODOT ${Boost_VERSION})
-@@ -45,18 +45,18 @@ option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+@@ -46,17 +46,18 @@ option(BUILD_SHARED_LIBS "Build shared libraries" ON)
#---- Find other packages ----
find_package(Threads)
-find_package(ZMQ)
+find_package(cppzmq)
- list(APPEND BEHAVIOR_TREE_EXTERNAL_LIBRARIES
+ list(APPEND BEHAVIOR_TREE_PUBLIC_LIBRARIES
${CMAKE_THREAD_LIBS_INIT}
${CMAKE_DL_LIBS}
- ${Boost_LIBRARIES} )
+ )
-if( ZMQ_FOUND )
+if( ZMQ_FOUND OR ON )
message(STATUS "ZeroMQ found.")
add_definitions( -DZMQ_FOUND )
list(APPEND BT_SOURCE src/loggers/bt_zmq_publisher.cpp)
-- list(APPEND BEHAVIOR_TREE_EXTERNAL_LIBRARIES ${ZMQ_LIBRARIES})
+ list(APPEND BEHAVIOR_TREE_EXTERNAL_LIBRARIES cppzmq)
else()
message(WARNING "ZeroMQ NOT found. Skipping the build of [PublisherZMQ] and [bt_recorder].")
|