diff --git a/3rdparty/lexy/CMakeLists.txt b/3rdparty/lexy/CMakeLists.txt index a76693a9e..3a63b7798 100644 --- a/3rdparty/lexy/CMakeLists.txt +++ b/3rdparty/lexy/CMakeLists.txt @@ -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) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cdeea380..117ff7daa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 - $<$:cppzmq> - $<$:SQLite::SQLite3> + $ + $ + $ + $ + $ PUBLIC ${BTCPP_EXTRA_LIBRARIES} ) +if(BTCPP_GROOT_INTERFACE) + target_link_libraries(${BTCPP_LIBRARY} + PRIVATE + $ + ) +endif() + +if(BTCPP_SQLITE_LOGGING) + target_link_libraries(${BTCPP_LIBRARY} + PRIVATE + $ + ) +endif() + target_include_directories(${BTCPP_LIBRARY} PUBLIC $ diff --git a/src/xml_parsing.cpp b/src/xml_parsing.cpp index da68be99a..5426cc2e4 100644 --- a/src/xml_parsing.cpp +++ b/src/xml_parsing.cpp @@ -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 #include "behaviortree_cpp/xml_parsing.h" -#include "tinyxml2.h" #include #ifdef USING_ROS2