From d9c144bc4e976ab3f54aa4f3cc7754f65839838f Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 9 Jul 2023 17:31:15 +0200 Subject: [PATCH] Fix missing symbols Signed-off-by: falkTX --- cmake/CMakeLists.txt | 11 +++-------- source/plugin/carla-host-plugin.cpp | 1 + source/plugin/carla-native-plugin.cpp | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index f11d32d60..aef27c6ee 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -719,8 +719,7 @@ target_compile_options(carla-bridge-native PRIVATE $<$:-Wno-format-truncation> $<$:-Wno-stringop-overflow> - $<$:-Wno-unused-parameter> - $<$:-Wno-unused-but-set-variable> + $<$:-Wno-unused-but-set-variable> $<$:-Wno-unused-parameter> ) @@ -862,10 +861,6 @@ target_compile_definitions(carla-native-plugin # FIXME # target_compile_options(carla-native-plugin # PRIVATE -# $<$:-Wno-unused-but-set-variable> -# $<$:-Wno-format-truncation> -# $<$:-Wno-stringop-overflow> -# $<$:-Wno-error=cpp> # $<$:-Wno-unused-parameter> # ) @@ -1029,10 +1024,10 @@ target_compile_definitions(carla-standalone # FIXME target_compile_options(carla-standalone PRIVATE + $<$:-Wno-error=cpp> $<$:-Wno-format-truncation> $<$:-Wno-stringop-overflow> - $<$:-Wno-error=cpp> - $<$:-Wno-unused-but-set-variable> + $<$:-Wno-unused-but-set-variable> $<$:-Wno-unused-parameter> ) diff --git a/source/plugin/carla-host-plugin.cpp b/source/plugin/carla-host-plugin.cpp index c341ab7bc..a67663926 100644 --- a/source/plugin/carla-host-plugin.cpp +++ b/source/plugin/carla-host-plugin.cpp @@ -18,6 +18,7 @@ #include "CarlaNativePlugin.h" #define CARLA_PLUGIN_BUILD +#define CARLA_HOST_PLUGIN_BUILD #include "carla-native-plugin.cpp" diff --git a/source/plugin/carla-native-plugin.cpp b/source/plugin/carla-native-plugin.cpp index 0ea582d22..ce97b45a4 100644 --- a/source/plugin/carla-native-plugin.cpp +++ b/source/plugin/carla-native-plugin.cpp @@ -26,7 +26,7 @@ // -------------------------------------------------------------------------------------------------------------------- // Expose info functions as needed -#ifndef CARLA_PLUGIN_BUILD +#ifndef CARLA_HOST_PLUGIN_BUILD # include "utils/Information.cpp" #endif