From f4fd3a176a06471eba73a9004a99381b23caf894 Mon Sep 17 00:00:00 2001 From: Dimitri Stolnikov Date: Sat, 3 Aug 2013 21:42:48 +0200 Subject: [PATCH] runtime: always export runtime and blocks symbols --- lib/CMakeLists.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 4bbc36a..4f1552c 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -55,6 +55,8 @@ GR_OSMOSDR_APPEND_LIBS( GR_REGISTER_COMPONENT("Built-in GNU Radio runtime" ENABLE_RUNTIME RUNTIME_MODE) if(ENABLE_RUNTIME) +ADD_DEFINITIONS(-Dgnuradio_runtime_EXPORTS -Dgnuradio_blocks_EXPORTS) + message(STATUS "") INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/ConfigChecks.cmake) @@ -173,7 +175,7 @@ if(HAVE_WINDOWS_H) include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc) ADD_DEFINITIONS(-DHAVE_WINDOWS_H -DUSING_WINSOCK -DWIN32_LEAN_AND_MEAN) ADD_DEFINITIONS(-DNOMINMAX -D_USE_MATH_DEFINES) - ADD_DEFINITIONS(/MP -D_CRT_SECURE_NO_WARNINGS -DD_CRT_SECURE_NO_DEPRECATE) + ADD_DEFINITIONS(/MP -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE) MESSAGE(STATUS "Adding windows libs to gnuradio osmosdr lib...") GR_OSMOSDR_APPEND_LIBS(WS2_32.lib WSock32.lib) endif(HAVE_WINDOWS_H) @@ -307,8 +309,3 @@ ADD_LIBRARY(gnuradio-osmosdr SHARED ${gr_osmosdr_srcs}) TARGET_LINK_LIBRARIES(gnuradio-osmosdr ${gr_osmosdr_libs}) SET_TARGET_PROPERTIES(gnuradio-osmosdr PROPERTIES DEFINE_SYMBOL "gnuradio_osmosdr_EXPORTS") GR_LIBRARY_FOO(gnuradio-osmosdr) - -if(ENABLE_RUNTIME) - SET_TARGET_PROPERTIES(gnuradio-osmosdr PROPERTIES DEFINE_SYMBOL "gnuradio_runtime_EXPORTS") - SET_TARGET_PROPERTIES(gnuradio-osmosdr PROPERTIES DEFINE_SYMBOL "gnuradio_blocks_EXPORTS") -endif(ENABLE_RUNTIME)