Skip to content

Commit 5230419

Browse files
committed
Remove wildcards cmake options, it has been removed on master
1 parent 7d40d96 commit 5230419

File tree

4 files changed

+1
-18
lines changed

4 files changed

+1
-18
lines changed

3rdparty/wildcards/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
This file was deleted.

CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ option(USE_VENDORED_LEXY "Use the bundled version of lexy" ON)
2626
option(USE_VENDORED_MINICORO "Use the bundled version of minicoro" ON)
2727
option(USE_VENDORED_MINITRACE "Use the bundled version of minitrace" ON)
2828
option(USE_VENDORED_TINYXML2 "Use the bundled version of tinyxml2" ON)
29-
option(USE_VENDORED_WILDCARDS "Use the bundled version of wildcards" ON)
3029

3130
set(BTCPP_LIB_DESTINATION lib)
3231
set(BTCPP_INCLUDE_DESTINATION include)
@@ -147,12 +146,6 @@ else()
147146
find_package(tinyxml2 REQUIRED)
148147
endif()
149148

150-
if(USE_VENDORED_WILDCARDS)
151-
add_subdirectory(3rdparty/wildcards)
152-
else()
153-
find_package(wildcards REQUIRED)
154-
endif()
155-
156149
list(APPEND BT_SOURCE
157150
src/action_node.cpp
158151
src/basic_types.cpp
@@ -239,7 +232,6 @@ target_link_libraries(${BTCPP_LIBRARY}
239232
flatbuffers::flatbuffers
240233
cpp-sqlite::cpp-sqlite
241234
cppzmq
242-
wildcards::wildcards
243235
PUBLIC
244236
${BTCPP_EXTRA_LIBRARIES}
245237
)

conanfile.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ def generate(self):
3434
tc.cache_variables["USE_VENDORED_MINICORO"] = False
3535
tc.cache_variables["USE_VENDORED_MINITRACE"] = False
3636
tc.cache_variables["USE_VENDORED_TINYXML2"] = False
37-
#tc.cache_variables["USE_VENDORED_WILDCARDS"] = False
3837
tc.generate()
3938

4039
deps = CMakeDeps(self)

tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@ else()
5656
endif()
5757

5858
target_include_directories(behaviortree_cpp_test PRIVATE include)
59-
target_link_libraries(behaviortree_cpp_test ${BTCPP_LIBRARY} bt_sample_nodes foonathan::lexy wildcards::wildcards)
59+
target_link_libraries(behaviortree_cpp_test ${BTCPP_LIBRARY} bt_sample_nodes foonathan::lexy)
6060
target_compile_definitions(behaviortree_cpp_test PRIVATE BT_TEST_FOLDER="${CMAKE_CURRENT_SOURCE_DIR}")

0 commit comments

Comments
 (0)