[Commit-gnuradio] [gnuradio] 02/02: cmake: follow-up to previous merge

commit-gnuradio
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/02: cmake: follow-up to previous merge

From:	git
Subject:	[Commit-gnuradio] [gnuradio] 02/02: cmake: follow-up to previous merge
Date:	Fri, 8 Aug 2014 21:25:07 +0000 (UTC)
This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch master
in repository gnuradio.

commit 2e691d87c12e7c465c26a13787e4b57d7fc62b7c
Author: Tom Rondeau <address@hidden>
Date:   Fri Aug 8 16:44:27 2014 -0400

    cmake: follow-up to previous merge
---
 docs/doxygen/other/build_guide.dox  | 1 -
 gnuradio-runtime/lib/CMakeLists.txt | 1 -
 gr-analog/lib/CMakeLists.txt        | 1 -
 gr-atsc/lib/CMakeLists.txt          | 1 -
 gr-audio/lib/CMakeLists.txt         | 1 -
 gr-blocks/lib/CMakeLists.txt        | 1 -
 gr-channels/lib/CMakeLists.txt      | 1 -
 gr-comedi/lib/CMakeLists.txt        | 1 -
 gr-digital/lib/CMakeLists.txt       | 1 -
 gr-dtv/lib/CMakeLists.txt           | 1 -
 gr-dtv/swig/CMakeLists.txt          | 1 -
 gr-fec/lib/CMakeLists.txt           | 1 -
 gr-fft/lib/CMakeLists.txt           | 1 -
 gr-filter/lib/CMakeLists.txt        | 1 -
 gr-noaa/lib/CMakeLists.txt          | 1 -
 gr-pager/lib/CMakeLists.txt         | 1 -
 gr-qtgui/lib/CMakeLists.txt         | 1 -
 gr-trellis/lib/CMakeLists.txt       | 1 -
 gr-video-sdl/lib/CMakeLists.txt     | 1 -
 gr-vocoder/lib/CMakeLists.txt       | 1 -
 gr-wavelet/lib/CMakeLists.txt       | 1 -
 gr-wxgui/lib/CMakeLists.txt         | 1 -
 gr-zeromq/lib/CMakeLists.txt        | 1 -
 23 files changed, 23 deletions(-)

diff --git a/docs/doxygen/other/build_guide.dox 
b/docs/doxygen/other/build_guide.dox
index 5375379..800734c 100644
--- a/docs/doxygen/other/build_guide.dox
+++ b/docs/doxygen/other/build_guide.dox
@@ -166,7 +166,6 @@ If not specified, the "Release" mode is the default.
 
 Here are som other potentially helpful CMake flags. These are to help you 
specifically locate certain dependencies. While the CMake scripts themselves 
should generally find these for us, we can use these to help direct CMake to 
specific locations if we have installed a different version elsewhere on the 
system that CMake doesn't know about.
 
-\li ICE_MANUAL_INSTALL_PATH: prefix of where ZeroC Ice was installed.
 \li QWT_LIBRARIES: shared library to use for Qwt (in the form 
<path>/libqwt.so).
 \li QWT_INCLUDE_DIRS: path to Qwt include files (e.g., /usr/include/qwt).
 \li PYTHON_EXECUTABLE: Location of the 'python' binary you want to use (e.g., 
/usr/bin/python2.7).
diff --git a/gnuradio-runtime/lib/CMakeLists.txt 
b/gnuradio-runtime/lib/CMakeLists.txt
index 85a091d..891f6d3 100644
--- a/gnuradio-runtime/lib/CMakeLists.txt
+++ b/gnuradio-runtime/lib/CMakeLists.txt
@@ -215,7 +215,6 @@ if(ENABLE_STATIC_LIBS)
 
     # Remove GR_CTRLPORT set this target's definitions.
     # Makes sure we don't try to use ControlPort stuff in source files
-    # since Ice will not work with static libs.
     GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
     list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
     SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
diff --git a/gr-analog/lib/CMakeLists.txt b/gr-analog/lib/CMakeLists.txt
index 6e92cd7..9c6c03c 100644
--- a/gr-analog/lib/CMakeLists.txt
+++ b/gr-analog/lib/CMakeLists.txt
@@ -112,7 +112,6 @@ if(ENABLE_STATIC_LIBS)
   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
-    # since Ice will not work with static libs.
     GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
     list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
     SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
diff --git a/gr-atsc/lib/CMakeLists.txt b/gr-atsc/lib/CMakeLists.txt
index 88bb56d..d7da2fb 100644
--- a/gr-atsc/lib/CMakeLists.txt
+++ b/gr-atsc/lib/CMakeLists.txt
@@ -131,7 +131,6 @@ if(ENABLE_STATIC_LIBS)
   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
-    # since Ice will not work with static libs.
     GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
     list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
     SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
diff --git a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt
index 5669d9c..3df9d1f 100644
--- a/gr-audio/lib/CMakeLists.txt
+++ b/gr-audio/lib/CMakeLists.txt
@@ -189,7 +189,6 @@ if(ENABLE_STATIC_LIBS)
   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
-    # since Ice will not work with static libs.
     GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
     list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
     SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index 554dcc8..32cc7b3 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -256,7 +256,6 @@ if(ENABLE_STATIC_LIBS)
 
     # Remove GR_CTRLPORT set this target's definitions.
     # Makes sure we don't try to use ControlPort stuff in source files
-    # since Ice will not work with static libs.
     GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
     list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
     SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
diff --git a/gr-channels/lib/CMakeLists.txt b/gr-channels/lib/CMakeLists.txt
index 305b4e0..17c4910 100644
--- a/gr-channels/lib/CMakeLists.txt
+++ b/gr-channels/lib/CMakeLists.txt
@@ -85,7 +85,6 @@ if(ENABLE_STATIC_LIBS)
   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
-    # since Ice will not work with static libs.
     GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
     list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
     SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
diff --git a/gr-comedi/lib/CMakeLists.txt b/gr-comedi/lib/CMakeLists.txt
index 98d4270..e6e58dc 100644
--- a/gr-comedi/lib/CMakeLists.txt
+++ b/gr-comedi/lib/CMakeLists.txt
@@ -60,7 +60,6 @@ if(ENABLE_STATIC_LIBS)
   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
-    # since Ice will not work with static libs.
     GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
     list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
     SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt
index ac9e00e..b3f5ee7 100644
--- a/gr-digital/lib/CMakeLists.txt
+++ b/gr-digital/lib/CMakeLists.txt
@@ -159,7 +159,6 @@ if(ENABLE_STATIC_LIBS)
   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
-    # since Ice will not work with static libs.
     GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
     list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
     SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
diff --git a/gr-dtv/lib/CMakeLists.txt b/gr-dtv/lib/CMakeLists.txt
index 9227f24..1035bcc 100644
--- a/gr-dtv/lib/CMakeLists.txt
+++ b/gr-dtv/lib/CMakeLists.txt
@@ -34,7 +34,6 @@ link_directories(${Boost_LIBRARY_DIRS})
 
 if(ENABLE_GR_CTRLPORT)
   ADD_DEFINITIONS(-DGR_CTRLPORT)
-  include_directories(${ICE_INCLUDE_DIR})
 endif(ENABLE_GR_CTRLPORT)
 
 ########################################################################
diff --git a/gr-dtv/swig/CMakeLists.txt b/gr-dtv/swig/CMakeLists.txt
index f1899a4..04b8b09 100644
--- a/gr-dtv/swig/CMakeLists.txt
+++ b/gr-dtv/swig/CMakeLists.txt
@@ -31,7 +31,6 @@ set(GR_SWIG_INCLUDE_DIRS
 
 if(ENABLE_GR_CTRLPORT)
   list(APPEND GR_SWIG_FLAGS "-DGR_CTRLPORT")
-  list(APPEND GR_SWIG_INCLUDE_DIRS ${ICE_INCLUDE_DIR})
 endif(ENABLE_GR_CTRLPORT)
 
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/dtv_swig_doc.i)
diff --git a/gr-fec/lib/CMakeLists.txt b/gr-fec/lib/CMakeLists.txt
index cbc5e5f..e261cb5 100644
--- a/gr-fec/lib/CMakeLists.txt
+++ b/gr-fec/lib/CMakeLists.txt
@@ -104,7 +104,6 @@ if(ENABLE_STATIC_LIBS)
   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
-    # since Ice will not work with static libs.
     GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
     list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
     SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
diff --git a/gr-fft/lib/CMakeLists.txt b/gr-fft/lib/CMakeLists.txt
index 41f6a9b..bc2264e 100644
--- a/gr-fft/lib/CMakeLists.txt
+++ b/gr-fft/lib/CMakeLists.txt
@@ -87,7 +87,6 @@ if(ENABLE_STATIC_LIBS)
   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
-    # since Ice will not work with static libs.
     GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
     list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
     SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
diff --git a/gr-filter/lib/CMakeLists.txt b/gr-filter/lib/CMakeLists.txt
index 99f54ca..13b5e4c 100644
--- a/gr-filter/lib/CMakeLists.txt
+++ b/gr-filter/lib/CMakeLists.txt
@@ -128,7 +128,6 @@ if(ENABLE_STATIC_LIBS)
   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
-    # since Ice will not work with static libs.
     GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
     list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
     SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
diff --git a/gr-noaa/lib/CMakeLists.txt b/gr-noaa/lib/CMakeLists.txt
index 5e7ede7..d8db07d 100644
--- a/gr-noaa/lib/CMakeLists.txt
+++ b/gr-noaa/lib/CMakeLists.txt
@@ -71,7 +71,6 @@ if(ENABLE_STATIC_LIBS)
   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
-    # since Ice will not work with static libs.
     GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
     list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
     SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
diff --git a/gr-pager/lib/CMakeLists.txt b/gr-pager/lib/CMakeLists.txt
index ddecf91..4a8c91c 100644
--- a/gr-pager/lib/CMakeLists.txt
+++ b/gr-pager/lib/CMakeLists.txt
@@ -79,7 +79,6 @@ if(ENABLE_STATIC_LIBS)
   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
-    # since Ice will not work with static libs.
     GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
     list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
     SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
diff --git a/gr-qtgui/lib/CMakeLists.txt b/gr-qtgui/lib/CMakeLists.txt
index 5858a1c..13a9bc6 100644
--- a/gr-qtgui/lib/CMakeLists.txt
+++ b/gr-qtgui/lib/CMakeLists.txt
@@ -167,7 +167,6 @@ if(ENABLE_STATIC_LIBS)
   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
-    # since Ice will not work with static libs.
     GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
     list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
     SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
diff --git a/gr-trellis/lib/CMakeLists.txt b/gr-trellis/lib/CMakeLists.txt
index b23e058..9c51d06 100644
--- a/gr-trellis/lib/CMakeLists.txt
+++ b/gr-trellis/lib/CMakeLists.txt
@@ -99,7 +99,6 @@ if(ENABLE_STATIC_LIBS)
   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
-    # since Ice will not work with static libs.
     GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
     list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
     SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
diff --git a/gr-video-sdl/lib/CMakeLists.txt b/gr-video-sdl/lib/CMakeLists.txt
index 24b916b..42ad24e 100644
--- a/gr-video-sdl/lib/CMakeLists.txt
+++ b/gr-video-sdl/lib/CMakeLists.txt
@@ -72,7 +72,6 @@ if(ENABLE_STATIC_LIBS)
   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
-    # since Ice will not work with static libs.
     GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
     list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
     SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt
index 697f260..2bc9adf 100644
--- a/gr-vocoder/lib/CMakeLists.txt
+++ b/gr-vocoder/lib/CMakeLists.txt
@@ -165,7 +165,6 @@ if(ENABLE_STATIC_LIBS)
   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
-    # since Ice will not work with static libs.
     GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
     list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
     SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt
index ee311a1..85eab28 100644
--- a/gr-wavelet/lib/CMakeLists.txt
+++ b/gr-wavelet/lib/CMakeLists.txt
@@ -95,7 +95,6 @@ if(ENABLE_STATIC_LIBS)
   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
-    # since Ice will not work with static libs.
     GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
     list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
     SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
diff --git a/gr-wxgui/lib/CMakeLists.txt b/gr-wxgui/lib/CMakeLists.txt
index 7f972f6..faa72ba 100644
--- a/gr-wxgui/lib/CMakeLists.txt
+++ b/gr-wxgui/lib/CMakeLists.txt
@@ -79,7 +79,6 @@ if(ENABLE_STATIC_LIBS)
   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
-    # since Ice will not work with static libs.
     GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
     list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
     SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
diff --git a/gr-zeromq/lib/CMakeLists.txt b/gr-zeromq/lib/CMakeLists.txt
index 4506be2..90cbb12 100644
--- a/gr-zeromq/lib/CMakeLists.txt
+++ b/gr-zeromq/lib/CMakeLists.txt
@@ -73,7 +73,6 @@ if(ENABLE_STATIC_LIBS)
   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
-    # since Ice will not work with static libs.
     GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
     list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
     SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")
[Prev in Thread]
Current Thread
[Next in Thread]
[Commit-gnuradio] [gnuradio] branch master updated (41d0844 -> 2e691d8), git, 2014/08/08
- [Commit-gnuradio] [gnuradio] 01/02: Merge branch 'maint', git, 2014/08/08
- [Commit-gnuradio] [gnuradio] 02/02: cmake: follow-up to previous merge, git <=
Prev by Date: [Commit-gnuradio] [gnuradio] 01/02: Merge branch 'maint'
Next by Date: [Commit-gnuradio] [gnuradio] branch next updated (fecc85c -> 4e7a996)
Previous by thread: [Commit-gnuradio] [gnuradio] 01/02: Merge branch 'maint'
Next by thread: [Commit-gnuradio] [gnuradio] branch next updated (fecc85c -> 4e7a996)
Index(es):
- Date
- Thread