From e8e2176529882db5d06265a12179efe9eee206f2 Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 9 Mar 2018 14:07:39 +0100 Subject: [PATCH] Removed sdrangel_EXPORTS --- exports/util/export.h | 2 +- sdrbase/CMakeLists.txt | 2 +- sdrgui/CMakeLists.txt | 2 +- sdrsrv/CMakeLists.txt | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/exports/util/export.h b/exports/util/export.h index 34e3c2830..dea1f929c 100644 --- a/exports/util/export.h +++ b/exports/util/export.h @@ -33,7 +33,7 @@ /* The 'SDRBASE_API' controls the import/export of 'sdrbase' symbols and classes. */ #if !defined(sdrangel_STATIC) -# if defined sdrangel_EXPORTS || defined sdrbase_EXPORTS +# if defined sdrbase_EXPORTS # define SDRBASE_API __SDR_EXPORT # else # define SDRBASE_API __SDR_IMPORT diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt index 30699a609..9217c8647 100644 --- a/sdrbase/CMakeLists.txt +++ b/sdrbase/CMakeLists.txt @@ -283,7 +283,7 @@ if (BUILD_DEBIAN) target_link_libraries(sdrbase serialdv) endif (BUILD_DEBIAN) -set_target_properties(sdrbase PROPERTIES DEFINE_SYMBOL "sdrangel_EXPORTS") +set_target_properties(sdrbase PROPERTIES DEFINE_SYMBOL "sdrbase_EXPORTS") target_compile_features(sdrbase PRIVATE cxx_generalized_initializers) # cmake >= 3.1.0 qt5_use_modules(sdrbase Core Multimedia) diff --git a/sdrgui/CMakeLists.txt b/sdrgui/CMakeLists.txt index 940a75881..32a4aa078 100644 --- a/sdrgui/CMakeLists.txt +++ b/sdrgui/CMakeLists.txt @@ -176,7 +176,7 @@ target_link_libraries(sdrgui logging ) -set_target_properties(sdrgui PROPERTIES DEFINE_SYMBOL "sdrangel_EXPORTS") +set_target_properties(sdrgui PROPERTIES DEFINE_SYMBOL "sdrgui_EXPORTS") target_compile_features(sdrgui PRIVATE cxx_generalized_initializers) # cmake >= 3.1.0 qt5_use_modules(sdrgui Core Widgets OpenGL Multimedia) diff --git a/sdrsrv/CMakeLists.txt b/sdrsrv/CMakeLists.txt index db0a2f090..d06292637 100644 --- a/sdrsrv/CMakeLists.txt +++ b/sdrsrv/CMakeLists.txt @@ -42,7 +42,6 @@ target_link_libraries(sdrsrv logging ) -set_target_properties(sdrsrv PROPERTIES DEFINE_SYMBOL "sdrangel_EXPORTS") target_compile_features(sdrsrv PRIVATE cxx_generalized_initializers) # cmake >= 3.1.0 qt5_use_modules(sdrsrv Core Multimedia)