From 600542fb589f78811d4706b26f3e7b8033a66878 Mon Sep 17 00:00:00 2001 From: Davide Faconti Date: Fri, 26 Jan 2024 13:24:52 +0100 Subject: [PATCH] always use the embedded FastCDR --- .../3rdparty/Fast-CDR/CMakeLists.txt | 2 +- .../ParserROS/rosx_introspection/CMakeLists.txt | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/plotjuggler_plugins/ParserROS/rosx_introspection/3rdparty/Fast-CDR/CMakeLists.txt b/plotjuggler_plugins/ParserROS/rosx_introspection/3rdparty/Fast-CDR/CMakeLists.txt index 271c0dbd0..afbe710c7 100644 --- a/plotjuggler_plugins/ParserROS/rosx_introspection/3rdparty/Fast-CDR/CMakeLists.txt +++ b/plotjuggler_plugins/ParserROS/rosx_introspection/3rdparty/Fast-CDR/CMakeLists.txt @@ -114,7 +114,7 @@ endif() # Global flag to cause add_library() to create shared libraries if on. # If set to true, this will cause all libraries to be built shared # unless the library was explicitly added as a static library. -option(BUILD_SHARED_LIBS "Create shared libraries by default" ON) +option(BUILD_SHARED_LIBS "Create shared libraries by default" OFF) ############################################################################### # Load external eProsima projects. diff --git a/plotjuggler_plugins/ParserROS/rosx_introspection/CMakeLists.txt b/plotjuggler_plugins/ParserROS/rosx_introspection/CMakeLists.txt index b39ae9412..0c3a4614e 100644 --- a/plotjuggler_plugins/ParserROS/rosx_introspection/CMakeLists.txt +++ b/plotjuggler_plugins/ParserROS/rosx_introspection/CMakeLists.txt @@ -9,14 +9,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON) -find_package(fastcdr QUIET) - -if(NOT fastcdr_FOUND ) - # Override Fast-CDR option: compile as static lib - SET(BUILD_SHARED_LIBS OFF CACHE BOOL "Create shared libraries by default") - add_subdirectory(3rdparty/Fast-CDR) - include_directories(3rdparty/Fast-CDR/include) -endif() +# Override Fast-CDR option: compile as static lib +add_subdirectory(3rdparty/Fast-CDR) +include_directories(3rdparty/Fast-CDR/include) ############################################### ## Declare a C++ library