[Commit-gnuradio] [gnuradio] 05/07: build: Ice does not support static libraries, so we can't build ControlPort if static libraries are being built.

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit f14e02cca7549eb44248b47eeabbd52197cb940b
Author: Tom Rondeau <address@hidden>
Date:   Fri Jun 27 16:54:50 2014 -0400

    build: Ice does not support static libraries, so we can't build ControlPort 
if static libraries are being built.
    
    We might be able to fine-tune this to build in ControlPort only for shared 
libraries but not for static libraries to avoid being this heavy-handed.
---
 gnuradio-runtime/CMakeLists.txt | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/gnuradio-runtime/CMakeLists.txt b/gnuradio-runtime/CMakeLists.txt
index f7733db..75410ab 100644
--- a/gnuradio-runtime/CMakeLists.txt
+++ b/gnuradio-runtime/CMakeLists.txt
@@ -1,17 +1,17 @@
 # Copyright 2013 Free Software Foundation, Inc.
-# 
+#
 # This file is part of GNU Radio
-# 
+#
 # GNU Radio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3, or (at your option)
 # any later version.
-# 
+#
 # GNU Radio is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with GNU Radio; see the file COPYING.  If not, write to
 # the Free Software Foundation, Inc., 51 Franklin Street,
@@ -60,6 +60,13 @@ GR_SET_GLOBAL(GNURADIO_RUNTIME_PYTHONPATH 
${GNURADIO_RUNTIME_PYTHONPATH})
 # Register controlport component
 ########################################################################
 
+if(ENABLE_STATIC_LIBS)
+  set(NOT_STATIC_LIBS False)
+  message(STATUS "ControlPort is incompatible with static library builds. 
Disabling.")
+else(ENABLE_STATIC_LIBS)
+  set(NOT_STATIC_LIBS True)
+endif(ENABLE_STATIC_LIBS)
+
 FIND_PACKAGE(ICE-3.5)  # check for ICE 3.5
 if(NOT ICE_FOUND)
   message(STATUS "ICE 3.5 not found. Looking for 3.4")
@@ -68,21 +75,22 @@ endif(NOT ICE_FOUND)
 FIND_PACKAGE(SWIG)
 
 if(SWIG_FOUND)
-    set(SWIG_VERSION_CHECK FALSE)
-    if("${SWIG_VERSION}" VERSION_GREATER "2.0.0")
-        set(SWIG_VERSION_CHECK TRUE)
-    else("${SWIG_VERSION}" VERSION_GREATER "2.0.0")
-      message(STATUS "")
-      message(STATUS "Ctrlport requires SWIG version >= 2.0")
-    endif()
+  set(SWIG_VERSION_CHECK FALSE)
+  if("${SWIG_VERSION}" VERSION_GREATER "2.0.0")
+    set(SWIG_VERSION_CHECK TRUE)
+  else("${SWIG_VERSION}" VERSION_GREATER "2.0.0")
+    message(STATUS "")
+    message(STATUS "Ctrlport requires SWIG version >= 2.0")
+  endif()
 endif(SWIG_FOUND)
 
 GR_REGISTER_COMPONENT("gr-ctrlport" ENABLE_GR_CTRLPORT
-    Boost_FOUND
-    SWIG_FOUND
-    SWIG_VERSION_CHECK
-    ICE_FOUND
-    ENABLE_GNURADIO_RUNTIME
+  Boost_FOUND
+  SWIG_FOUND
+  SWIG_VERSION_CHECK
+  ICE_FOUND
+  ENABLE_GNURADIO_RUNTIME
+  NOT_STATIC_LIBS
 )
 
 ########################################################################