Avoid useless sdrbase dependency by moving the exports header in its own folder

2018-03-09 13:48:14 +01:00 · 2018-03-09 13:48:14 +01:00 · 4f9a49cf02
commit 4f9a49cf02
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -221,6 +221,7 @@ add_subdirectory(swagger)

 include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/exports
    ${CMAKE_SOURCE_DIR}/sdrbase
    ${CMAKE_SOURCE_DIR}/sdrgui
    ${CMAKE_SOURCE_DIR}/logging
--- a/exports/util/export.h
+++ b/exports/util/export.h
--- a/httpserver/CMakeLists.txt
+++ b/httpserver/CMakeLists.txt
@ -33,7 +33,7 @@ set(httpserver_HEADERS

 include_directories(
 	.
-    ${CMAKE_SOURCE_DIR}/sdrbase	
+    ${CMAKE_SOURCE_DIR}/exports
 	${CMAKE_CURRENT_BINARY_DIR}
 )

--- a/logging/CMakeLists.txt
+++ b/logging/CMakeLists.txt
@ -19,7 +19,7 @@ set(httpserver_HEADERS

 include_directories(
 	.
-    ${CMAKE_SOURCE_DIR}/sdrbase 
+    ${CMAKE_SOURCE_DIR}/exports 
 	${CMAKE_CURRENT_BINARY_DIR}
 )

--- a/pluginssrv/samplesink/filesink/CMakeLists.txt
+++ b/pluginssrv/samplesink/filesink/CMakeLists.txt
@ -20,6 +20,7 @@ set(filesink_HEADERS
 include_directories(
 	.
 	${CMAKE_CURRENT_BINARY_DIR}
+	${CMAKE_SOURCE_DIR}/exports
    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
 )

--- a/pluginssrv/samplesink/hackrfoutput/CMakeLists.txt
+++ b/pluginssrv/samplesink/hackrfoutput/CMakeLists.txt
@ -21,6 +21,7 @@ if (BUILD_DEBIAN)
 include_directories(
        .
    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/exports
    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
    ${CMAKE_SOURCE_DIR}/devices    
    ${LIBHACKRFSRC}
@ -30,6 +31,7 @@ else (BUILD_DEBIAN)
 include_directories(
        .
    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/exports
    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
    ${CMAKE_SOURCE_DIR}/devices    
    ${LIBHACKRF_INCLUDE_DIR}
--- a/pluginssrv/samplesink/limesdroutput/CMakeLists.txt
+++ b/pluginssrv/samplesink/limesdroutput/CMakeLists.txt
@ -21,6 +21,7 @@ if (BUILD_DEBIAN)
 include_directories(
        .
    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/exports
    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
    ${CMAKE_SOURCE_DIR}/devices    
    ${LIBLIMESUITESRC}/src
@ -37,6 +38,7 @@ else (BUILD_DEBIAN)
 include_directories(
 	.
 	${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/exports
    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${LIMESUITE_INCLUDE_DIR}
--- a/pluginssrv/samplesource/filesource/CMakeLists.txt
+++ b/pluginssrv/samplesource/filesource/CMakeLists.txt
@ -19,6 +19,7 @@ set(filesource_HEADERS

 include_directories(
 	.
+	${CMAKE_SOURCE_DIR}/exports
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )
--- a/pluginssrv/samplesource/hackrfinput/CMakeLists.txt
+++ b/pluginssrv/samplesource/hackrfinput/CMakeLists.txt
@ -20,6 +20,7 @@ set(hackrfinput_HEADERS
 if (BUILD_DEBIAN)
 include_directories(
        .
+    ${CMAKE_SOURCE_DIR}/exports
    ${CMAKE_CURRENT_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
    ${CMAKE_SOURCE_DIR}/devices    
@ -29,6 +30,7 @@ include_directories(
 else (BUILD_DEBIAN)
 include_directories(
        .
+    ${CMAKE_SOURCE_DIR}/exports
    ${CMAKE_CURRENT_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
    ${CMAKE_SOURCE_DIR}/devices    
--- a/pluginssrv/samplesource/limesdrinput/CMakeLists.txt
+++ b/pluginssrv/samplesource/limesdrinput/CMakeLists.txt
@ -21,6 +21,7 @@ if (BUILD_DEBIAN)
 include_directories(
        .
    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/exports
    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
    ${CMAKE_SOURCE_DIR}/devices    
    ${LIBLIMESUITESRC}/src
@ -36,7 +37,8 @@ include_directories(
 else (BUILD_DEBIAN)
 include_directories(
 	.
-	${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/exports
    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client	
 	${CMAKE_SOURCE_DIR}/devices
 	${LIMESUITE_INCLUDE_DIR}
--- a/pluginssrv/samplesource/rtlsdr/CMakeLists.txt
+++ b/pluginssrv/samplesource/rtlsdr/CMakeLists.txt
@ -21,6 +21,7 @@ if (BUILD_DEBIAN)
 include_directories(
    .
    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/exports
    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
    ${LIBRTLSDRSRC}/include
    ${LIBRTLSDRSRC}/src
@ -29,6 +30,7 @@ else (BUILD_DEBIAN)
 include_directories(
    .
    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/exports
    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
    ${LIBRTLSDR_INCLUDE_DIR}
 )
--- a/qrtplib/CMakeLists.txt
+++ b/qrtplib/CMakeLists.txt
@ -74,7 +74,7 @@ set(qrtplib_SOURCES

 include_directories(
    .
-    ${CMAKE_SOURCE_DIR}/sdrbase
+    ${CMAKE_SOURCE_DIR}/exports
    ${CMAKE_CURRENT_BINARY_DIR}
 )

--- a/sdrbase/CMakeLists.txt
+++ b/sdrbase/CMakeLists.txt
@ -168,7 +168,7 @@ set(sdrbase_HEADERS
    util/CRC64.h
    util/db.h
    util/doublebuffer.h
-    util/export.h
+    #util/export.h
    util/fixedtraits.h
    util/message.h
    util/messagequeue.h
@ -258,6 +258,7 @@ add_library(sdrbase SHARED
 include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    .
+    ${CMAKE_SOURCE_DIR}/exports
    ${CMAKE_SOURCE_DIR}/httpserver
    ${CMAKE_SOURCE_DIR}/qrtplib
    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
--- a/sdrgui/CMakeLists.txt
+++ b/sdrgui/CMakeLists.txt
@ -160,6 +160,7 @@ add_library(sdrgui SHARED

 include_directories(
    .
+    ${CMAKE_SOURCE_DIR}/exports
    ${CMAKE_SOURCE_DIR}/sdrbase
    ${CMAKE_SOURCE_DIR}/logging
    ${CMAKE_SOURCE_DIR}/httpserver
--- a/sdrsrv/CMakeLists.txt
+++ b/sdrsrv/CMakeLists.txt
@ -27,6 +27,7 @@ add_library(sdrsrv SHARED

 include_directories(
    .
+    ${CMAKE_SOURCE_DIR}/exports
    ${CMAKE_SOURCE_DIR}/sdrbase
    ${CMAKE_SOURCE_DIR}/logging
    ${CMAKE_SOURCE_DIR}/httpserver