[Commit-gnuradio] [gnuradio] 14/21: controlport: build: allowing ControlPort and probes in static builds.

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch android
in repository gnuradio.

commit 89557c62c813180de21e10eb8baef31762fcdbf7
Author: Tom Rondeau <address@hidden>
Date:   Tue Apr 28 12:21:57 2015 -0400

    controlport: build: allowing ControlPort and probes in static builds.
    
    Apache Thrift can be built and used statically; now just tests if ICE
    is present and removes ControlPort only then.
---
 gnuradio-runtime/lib/CMakeLists.txt | 29 ++++++++++++++++-------------
 gr-blocks/lib/CMakeLists.txt        | 22 ++++++++++++----------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/gnuradio-runtime/lib/CMakeLists.txt 
b/gnuradio-runtime/lib/CMakeLists.txt
index 1ec2d9b..cebd73e 100644
--- a/gnuradio-runtime/lib/CMakeLists.txt
+++ b/gnuradio-runtime/lib/CMakeLists.txt
@@ -217,20 +217,23 @@ add_dependencies(gnuradio-runtime
 # STATIC LIB BUILD
 #######################################################
 if(ENABLE_STATIC_LIBS)
-  # Remove controlport-specific source files from staticlibs build
+  # Remove controlport-specific source files from staticlibs build if
+  # ICE is the backend since it does not build statically.
   if(ENABLE_GR_CTRLPORT)
-    list(REMOVE_ITEM gnuradio_runtime_sources
-      ${gnuradio_ctrlport_sources}
-      )
-
-    # Remove GR_CTRLPORT set this target's definitions.
-    # Makes sure we don't try to use ControlPort stuff in source files
-    GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
-    list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
-    SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
-
-    # readd it to the target since we removed it from the directory-wide list.
-    SET_PROPERTY(TARGET gnuradio-runtime APPEND PROPERTY COMPILE_DEFINITIONS 
"GR_CTRLPORT")
+    if(ICE_FOUND)
+      list(REMOVE_ITEM gnuradio_runtime_sources
+        ${gnuradio_ctrlport_sources}
+        )
+
+      # Remove GR_CTRLPORT set this target's definitions.
+      # Makes sure we don't try to use ControlPort stuff in source files
+      GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
+      list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
+      SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
+
+      # readd it to the target since we removed it from the directory-wide 
list.
+      SET_PROPERTY(TARGET gnuradio-runtime APPEND PROPERTY COMPILE_DEFINITIONS 
"GR_CTRLPORT")
+    endif(ICE_FOUND)
   endif(ENABLE_GR_CTRLPORT)
 
   add_library(gnuradio-runtime_static STATIC ${gnuradio_runtime_sources})
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index cd164f2..0f5d9fa 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -251,18 +251,20 @@ GR_LIBRARY_FOO(gnuradio-blocks RUNTIME_COMPONENT 
"blocks_runtime" DEVEL_COMPONEN
 if(ENABLE_STATIC_LIBS)
   # Remove controlport-specific source files from staticlibs build
   if(ENABLE_GR_CTRLPORT)
-    list(REMOVE_ITEM gr_blocks_sources
-      ${blocks_ctrlport_sources}
-      )
+    if(ICE_FOUND)
+      list(REMOVE_ITEM gr_blocks_sources
+        ${blocks_ctrlport_sources}
+        )
 
-    # Remove GR_CTRLPORT set this target's definitions.
-    # Makes sure we don't try to use ControlPort stuff in source files
-    GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
-    list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
-    SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
+      # Remove GR_CTRLPORT set this target's definitions.
+      # Makes sure we don't try to use ControlPort stuff in source files
+      GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
+      list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
+      SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
 
-    # readd it to the target since we removed it from the directory-wide list.
-    SET_PROPERTY(TARGET gnuradio-blocks APPEND PROPERTY COMPILE_DEFINITIONS 
"GR_CTRLPORT")
+      # readd it to the target since we removed it from the directory-wide 
list.
+      SET_PROPERTY(TARGET gnuradio-blocks APPEND PROPERTY COMPILE_DEFINITIONS 
"GR_CTRLPORT")
+    endif(ICE_FOUND)
   endif(ENABLE_GR_CTRLPORT)
 
   add_library(gnuradio-blocks_static STATIC ${gr_blocks_sources})