Skip to content

Commit 2e691d8

Browse files
trondeautrondeau
committedAug 8, 2014
cmake: follow-up to previous merge
·
v3.7.6.13.7.6git
1 parent 4ac2800 commit 2e691d8

File tree

23 files changed

+0
-23
lines changed

23 files changed

+0
-23
lines changed
 

‎docs/doxygen/other/build_guide.dox

-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ If not specified, the "Release" mode is the default.
166166

167167
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.
168168

169-
\li ICE_MANUAL_INSTALL_PATH: prefix of where ZeroC Ice was installed.
170169
\li QWT_LIBRARIES: shared library to use for Qwt (in the form <path>/libqwt.so).
171170
\li QWT_INCLUDE_DIRS: path to Qwt include files (e.g., /usr/include/qwt).
172171
\li PYTHON_EXECUTABLE: Location of the 'python' binary you want to use (e.g., /usr/bin/python2.7).

‎gnuradio-runtime/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ if(ENABLE_STATIC_LIBS)
215215

216216
# Remove GR_CTRLPORT set this target's definitions.
217217
# Makes sure we don't try to use ControlPort stuff in source files
218-
# since Ice will not work with static libs.
219218
GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
220219
list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
221220
SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")

‎gr-analog/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ if(ENABLE_STATIC_LIBS)
112112
if(ENABLE_GR_CTRLPORT)
113113
# Remove GR_CTRLPORT set this target's definitions.
114114
# Makes sure we don't try to use ControlPort stuff in source files
115-
# since Ice will not work with static libs.
116115
GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
117116
list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
118117
SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")

‎gr-atsc/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ if(ENABLE_STATIC_LIBS)
131131
if(ENABLE_GR_CTRLPORT)
132132
# Remove GR_CTRLPORT set this target's definitions.
133133
# Makes sure we don't try to use ControlPort stuff in source files
134-
# since Ice will not work with static libs.
135134
GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
136135
list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
137136
SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")

‎gr-audio/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ if(ENABLE_STATIC_LIBS)
189189
if(ENABLE_GR_CTRLPORT)
190190
# Remove GR_CTRLPORT set this target's definitions.
191191
# Makes sure we don't try to use ControlPort stuff in source files
192-
# since Ice will not work with static libs.
193192
GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
194193
list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
195194
SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")

‎gr-blocks/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ if(ENABLE_STATIC_LIBS)
256256

257257
# Remove GR_CTRLPORT set this target's definitions.
258258
# Makes sure we don't try to use ControlPort stuff in source files
259-
# since Ice will not work with static libs.
260259
GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
261260
list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
262261
SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")

‎gr-channels/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ if(ENABLE_STATIC_LIBS)
8585
if(ENABLE_GR_CTRLPORT)
8686
# Remove GR_CTRLPORT set this target's definitions.
8787
# Makes sure we don't try to use ControlPort stuff in source files
88-
# since Ice will not work with static libs.
8988
GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
9089
list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
9190
SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")

‎gr-comedi/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ if(ENABLE_STATIC_LIBS)
6060
if(ENABLE_GR_CTRLPORT)
6161
# Remove GR_CTRLPORT set this target's definitions.
6262
# Makes sure we don't try to use ControlPort stuff in source files
63-
# since Ice will not work with static libs.
6463
GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
6564
list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
6665
SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")

‎gr-digital/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ if(ENABLE_STATIC_LIBS)
159159
if(ENABLE_GR_CTRLPORT)
160160
# Remove GR_CTRLPORT set this target's definitions.
161161
# Makes sure we don't try to use ControlPort stuff in source files
162-
# since Ice will not work with static libs.
163162
GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
164163
list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
165164
SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")

‎gr-dtv/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ link_directories(${Boost_LIBRARY_DIRS})
3434

3535
if(ENABLE_GR_CTRLPORT)
3636
ADD_DEFINITIONS(-DGR_CTRLPORT)
37-
include_directories(${ICE_INCLUDE_DIR})
3837
endif(ENABLE_GR_CTRLPORT)
3938

4039
########################################################################

‎gr-dtv/swig/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ set(GR_SWIG_INCLUDE_DIRS
3131

3232
if(ENABLE_GR_CTRLPORT)
3333
list(APPEND GR_SWIG_FLAGS "-DGR_CTRLPORT")
34-
list(APPEND GR_SWIG_INCLUDE_DIRS ${ICE_INCLUDE_DIR})
3534
endif(ENABLE_GR_CTRLPORT)
3635

3736
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/dtv_swig_doc.i)

‎gr-fec/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ if(ENABLE_STATIC_LIBS)
104104
if(ENABLE_GR_CTRLPORT)
105105
# Remove GR_CTRLPORT set this target's definitions.
106106
# Makes sure we don't try to use ControlPort stuff in source files
107-
# since Ice will not work with static libs.
108107
GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
109108
list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
110109
SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")

‎gr-fft/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ if(ENABLE_STATIC_LIBS)
8787
if(ENABLE_GR_CTRLPORT)
8888
# Remove GR_CTRLPORT set this target's definitions.
8989
# Makes sure we don't try to use ControlPort stuff in source files
90-
# since Ice will not work with static libs.
9190
GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
9291
list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
9392
SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")

‎gr-filter/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ if(ENABLE_STATIC_LIBS)
128128
if(ENABLE_GR_CTRLPORT)
129129
# Remove GR_CTRLPORT set this target's definitions.
130130
# Makes sure we don't try to use ControlPort stuff in source files
131-
# since Ice will not work with static libs.
132131
GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
133132
list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
134133
SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")

‎gr-noaa/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ if(ENABLE_STATIC_LIBS)
7171
if(ENABLE_GR_CTRLPORT)
7272
# Remove GR_CTRLPORT set this target's definitions.
7373
# Makes sure we don't try to use ControlPort stuff in source files
74-
# since Ice will not work with static libs.
7574
GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
7675
list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
7776
SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")

‎gr-pager/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ if(ENABLE_STATIC_LIBS)
7979
if(ENABLE_GR_CTRLPORT)
8080
# Remove GR_CTRLPORT set this target's definitions.
8181
# Makes sure we don't try to use ControlPort stuff in source files
82-
# since Ice will not work with static libs.
8382
GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
8483
list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
8584
SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")

‎gr-qtgui/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ if(ENABLE_STATIC_LIBS)
167167
if(ENABLE_GR_CTRLPORT)
168168
# Remove GR_CTRLPORT set this target's definitions.
169169
# Makes sure we don't try to use ControlPort stuff in source files
170-
# since Ice will not work with static libs.
171170
GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
172171
list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
173172
SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")

‎gr-trellis/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ if(ENABLE_STATIC_LIBS)
9999
if(ENABLE_GR_CTRLPORT)
100100
# Remove GR_CTRLPORT set this target's definitions.
101101
# Makes sure we don't try to use ControlPort stuff in source files
102-
# since Ice will not work with static libs.
103102
GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
104103
list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
105104
SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")

‎gr-video-sdl/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ if(ENABLE_STATIC_LIBS)
7272
if(ENABLE_GR_CTRLPORT)
7373
# Remove GR_CTRLPORT set this target's definitions.
7474
# Makes sure we don't try to use ControlPort stuff in source files
75-
# since Ice will not work with static libs.
7675
GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
7776
list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
7877
SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")

‎gr-vocoder/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ if(ENABLE_STATIC_LIBS)
165165
if(ENABLE_GR_CTRLPORT)
166166
# Remove GR_CTRLPORT set this target's definitions.
167167
# Makes sure we don't try to use ControlPort stuff in source files
168-
# since Ice will not work with static libs.
169168
GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
170169
list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
171170
SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")

‎gr-wavelet/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ if(ENABLE_STATIC_LIBS)
9595
if(ENABLE_GR_CTRLPORT)
9696
# Remove GR_CTRLPORT set this target's definitions.
9797
# Makes sure we don't try to use ControlPort stuff in source files
98-
# since Ice will not work with static libs.
9998
GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
10099
list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
101100
SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")

‎gr-wxgui/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ if(ENABLE_STATIC_LIBS)
7979
if(ENABLE_GR_CTRLPORT)
8080
# Remove GR_CTRLPORT set this target's definitions.
8181
# Makes sure we don't try to use ControlPort stuff in source files
82-
# since Ice will not work with static libs.
8382
GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
8483
list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
8584
SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")

‎gr-zeromq/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ if(ENABLE_STATIC_LIBS)
7373
if(ENABLE_GR_CTRLPORT)
7474
# Remove GR_CTRLPORT set this target's definitions.
7575
# Makes sure we don't try to use ControlPort stuff in source files
76-
# since Ice will not work with static libs.
7776
GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS)
7877
list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT")
7978
SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}")

0 commit comments

Comments
 (0)
Please sign in to comment.