[behaviortree-cpp] add REQUIRED to find_package calls (#13087)

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
This commit is contained in:
nicole mazzuca 2020-08-24 10:33:57 -07:00 committed by GitHub
parent 3283dd7fb7
commit 20678a5fe7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 1 deletions

View File

@ -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()

View File

@ -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()

View File

@ -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"
]
}