diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-08-24 10:33:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-24 10:33:57 -0700 |
| commit | 20678a5fe789aebf4cb7687b555c965776447b63 (patch) | |
| tree | 5d5ed3fc10abdd8dcacf59f62d53741075066aff /ports | |
| parent | 3283dd7fb7044118a302c9e32956aaaf3afc9b04 (diff) | |
| download | vcpkg-20678a5fe789aebf4cb7687b555c965776447b63.tar.gz vcpkg-20678a5fe789aebf4cb7687b555c965776447b63.zip | |
[behaviortree-cpp] add REQUIRED to find_package calls (#13087)
Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/behaviortree-cpp/002_fix_dependencies.patch | 35 | ||||
| -rw-r--r-- | ports/behaviortree-cpp/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/behaviortree-cpp/vcpkg.json | 4 |
3 files changed, 43 insertions, 1 deletions
diff --git a/ports/behaviortree-cpp/002_fix_dependencies.patch b/ports/behaviortree-cpp/002_fix_dependencies.patch new file mode 100644 index 000000000..76d7857db --- /dev/null +++ b/ports/behaviortree-cpp/002_fix_dependencies.patch @@ -0,0 +1,35 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 75dea11..23053ca 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,7 +14,7 @@ if(MSVC)
+ endif()
+
+ #---- 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)
+
+ #---- Find other packages ----
+ find_package(Threads)
+-find_package(ZMQ)
++find_package(cppzmq)
+
+ list(APPEND BEHAVIOR_TREE_EXTERNAL_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].")
+ endif()
diff --git a/ports/behaviortree-cpp/portfile.cmake b/ports/behaviortree-cpp/portfile.cmake index a5baff43c..b689ab480 100644 --- a/ports/behaviortree-cpp/portfile.cmake +++ b/ports/behaviortree-cpp/portfile.cmake @@ -13,11 +13,16 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE}
PATCHES
001_port_fixes.patch
+ 002_fix_dependencies.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
+ OPTIONS
+ -DBUILD_EXAMPLES=OFF
+ -DBUILD_UNIT_TESTS=OFF
+ -DBUILD_TOOLS=OFF
)
vcpkg_install_cmake()
diff --git a/ports/behaviortree-cpp/vcpkg.json b/ports/behaviortree-cpp/vcpkg.json index f14ea22da..97731b09c 100644 --- a/ports/behaviortree-cpp/vcpkg.json +++ b/ports/behaviortree-cpp/vcpkg.json @@ -1,10 +1,12 @@ { "name": "behaviortree-cpp", "version-string": "3.5.1", + "port-version": 1, "description": "Behavior Trees Library in C++.", "homepage": "https://www.behaviortree.dev", "supports": "!uwp & !osx", "dependencies": [ - "boost-coroutine2" + "boost-coroutine2", + "cppzmq" ] } |