[Commit-gnuradio] [gnuradio] 08/13: uhd: open support for controlport in static builds.

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 86fa885c2736eed501b1e13dcab786d5e88cadec
Author: Tom Rondeau <address@hidden>
Date:   Fri Oct 16 12:21:55 2015 -0400

    uhd: open support for controlport in static builds.
    
    This was a limitation of ICE that is no longer necessary with Thrift.
---
 gr-uhd/lib/CMakeLists.txt | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/gr-uhd/lib/CMakeLists.txt b/gr-uhd/lib/CMakeLists.txt
index 531bd40..b57b80b 100644
--- a/gr-uhd/lib/CMakeLists.txt
+++ b/gr-uhd/lib/CMakeLists.txt
@@ -82,16 +82,6 @@ GR_LIBRARY_FOO(gnuradio-uhd RUNTIME_COMPONENT "uhd_runtime" 
DEVEL_COMPONENT "uhd
 ########################################################################
 if(ENABLE_STATIC_LIBS)
   if(UHD_VERSION VERSION_GREATER "3.8.1")
-    if(ENABLE_GR_CTRLPORT)
-      # 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-uhd APPEND PROPERTY COMPILE_DEFINITIONS 
"GR_CTRLPORT")
-    endif(ENABLE_GR_CTRLPORT)
 
     add_library(gnuradio-uhd_static STATIC ${gr_uhd_sources})