Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty/lexy/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ option(LEXY_FORCE_CPP17 "Whether or not lexy should use C++17 even if compil

add_subdirectory(src)

option(LEXY_ENABLE_INSTALL "whether or not to enable the install rule" ON)
option(LEXY_ENABLE_INSTALL "whether or not to enable the install rule" OFF)
if(LEXY_ENABLE_INSTALL)
include(CMakePackageConfigHelpers)
include(GNUInstallDirs)
Expand Down
26 changes: 19 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -226,17 +226,29 @@ target_link_libraries(${BTCPP_LIBRARY}
PRIVATE
Threads::Threads
${CMAKE_DL_LIBS}
foonathan::lexy
minitrace::minitrace
tinyxml2::tinyxml2
minicoro::minicoro
flatbuffers::flatbuffers
$<$<BOOL:${BTCPP_GROOT_INTERFACE}>:cppzmq>
$<$<BOOL:${BTCPP_SQLITE_LOGGING}>:SQLite::SQLite3>
$<BUILD_INTERFACE:foonathan::lexy>
$<BUILD_INTERFACE:minitrace::minitrace>
$<BUILD_INTERFACE:tinyxml2::tinyxml2>
$<BUILD_INTERFACE:minicoro::minicoro>
$<BUILD_INTERFACE:flatbuffers::flatbuffers>
PUBLIC
${BTCPP_EXTRA_LIBRARIES}
)

if(BTCPP_GROOT_INTERFACE)
target_link_libraries(${BTCPP_LIBRARY}
PRIVATE
$<BUILD_INTERFACE:cppzmq>
)
endif()

if(BTCPP_SQLITE_LOGGING)
target_link_libraries(${BTCPP_LIBRARY}
PRIVATE
$<BUILD_INTERFACE:SQLite::SQLite3>
)
endif()

target_include_directories(${BTCPP_LIBRARY}
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
Expand Down
8 changes: 7 additions & 1 deletion src/xml_parsing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,17 @@
#if defined(__linux) || defined(__linux__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wattributes"
#pragma GCC diagnostic ignored "-Wtype-limits"
#endif

#include "tinyxml2.h"

#if defined(__linux) || defined(__linux__)
#pragma GCC diagnostic pop
#endif

#include <map>
#include "behaviortree_cpp/xml_parsing.h"
#include "tinyxml2.h"
#include <filesystem>

#ifdef USING_ROS2
Expand Down
Loading