Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Markus Dittrich (markusle)" <markusle@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-visualization/paraview/files: paraview-3.6.1-install-fix.patch paraview-3.6.1-assistant.patch paraview-3.6.1-hdf-1.8.3.patch paraview-3.6.1-pointsprite-disable.patch paraview-3.6.1-qt.patch paraview-3.2-support-qt4.3.patch paraview-2.6.0-hdf5-zlib.patch paraview-3.2-libxml2-fix.patch paraview-2.6.0-include.patch paraview-2.6.2-tkImgGIF.patch
Date: Fri, 24 Jul 2009 15:06:07
Message-Id: E1MUMLU-0003Rx-Q6@stork.gentoo.org
1 markusle 09/07/24 15:06:04
2
3 Added: paraview-3.6.1-install-fix.patch
4 paraview-3.6.1-assistant.patch
5 paraview-3.6.1-hdf-1.8.3.patch
6 paraview-3.6.1-pointsprite-disable.patch
7 paraview-3.6.1-qt.patch
8 Removed: paraview-3.2-support-qt4.3.patch
9 paraview-2.6.0-hdf5-zlib.patch
10 paraview-3.2-libxml2-fix.patch
11 paraview-2.6.0-include.patch
12 paraview-2.6.2-tkImgGIF.patch
13 Log:
14 Version bump (bug #278563) and big cleanup.
15 (Portage version: 2.1.6.13/cvs/Linux x86_64)
16
17 Revision Changes Path
18 1.1 sci-visualization/paraview/files/paraview-3.6.1-install-fix.patch
19
20 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.1-install-fix.patch?rev=1.1&view=markup
21 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.1-install-fix.patch?rev=1.1&content-type=text/plain
22
23 Index: paraview-3.6.1-install-fix.patch
24 ===================================================================
25 diff -ru ParaView3/Applications/Client/CMakeLists.txt ParaView3.new/Applications/Client/CMakeLists.txt
26 --- ParaView3/Applications/Client/CMakeLists.txt 2009-07-20 15:36:01.000000000 -0400
27 +++ ParaView3.new/Applications/Client/CMakeLists.txt 2009-07-22 18:35:55.000000000 -0400
28 @@ -499,17 +499,17 @@
29
30 # Install system libraries on Linux (will not work on any other Unix
31 # yet)
32 -FOREACH(fmpglib avcodec avformat avutil)
33 - IF(FFMPEG_${fmpglib}_LIBRARY)
34 - GET_FILENAME_COMPONENT(FFMPEG_LIB_DIR_tmp ${FFMPEG_${fmpglib}_LIBRARY} PATH)
35 - GET_FILENAME_COMPONENT(FFMPEG_LIB_NAME_tmp ${FFMPEG_${fmpglib}_LIBRARY} NAME)
36 - FILE(GLOB FFMPEG_LIB_LIST RELATIVE ${FFMPEG_LIB_DIR_tmp} "${FFMPEG_${fmpglib}_LIBRARY}*")
37 - INSTALL(CODE "
38 -MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${FFMPEG_LIB_NAME_tmp}\")
39 -EXECUTE_PROCESS (WORKING_DIRECTORY ${FFMPEG_LIB_DIR_tmp}
40 - COMMAND tar c ${FFMPEG_LIB_LIST}
41 - COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
42 - " COMPONENT Runtime)
43 +#FOREACH(fmpglib avcodec avformat avutil)
44 +# IF(FFMPEG_${fmpglib}_LIBRARY)
45 +# GET_FILENAME_COMPONENT(FFMPEG_LIB_DIR_tmp ${FFMPEG_${fmpglib}_LIBRARY} PATH)
46 +# GET_FILENAME_COMPONENT(FFMPEG_LIB_NAME_tmp ${FFMPEG_${fmpglib}_LIBRARY} NAME)
47 +# FILE(GLOB FFMPEG_LIB_LIST RELATIVE ${FFMPEG_LIB_DIR_tmp} "${FFMPEG_${fmpglib}_LIBRARY}*")
48 +# INSTALL(CODE "
49 +#MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${FFMPEG_LIB_NAME_tmp}\")
50 +#EXECUTE_PROCESS (WORKING_DIRECTORY ${FFMPEG_LIB_DIR_tmp}
51 +# COMMAND tar c ${FFMPEG_LIB_LIST}
52 +# COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
53 +# " COMPONENT Runtime)
54 #INSTALL(FILES ${FFMPEG_${fmpglib}_LIBRARY} DESTINATION ${PV_INSTALL_LIB_DIR})
55
56 ENDIF(FFMPEG_${fmpglib}_LIBRARY)
57 @@ -527,26 +527,26 @@
58 SET (QTLIBLIST ${QTLIBLIST} QTOPENGL)
59 ENDIF (VTK_USE_QVTK_QTOPENGL)
60
61 -IF(NOT Q_WS_MAC)
62 - FOREACH(qtlib ${QTLIBLIST})
63 - IF (NOT WIN32)
64 - #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR})
65 - GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
66 - GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
67 - FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
68 - INSTALL(CODE "
69 -MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\")
70 -EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
71 - COMMAND tar c ${QT_LIB_LIST}
72 - COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
73 - " COMPONENT Runtime)
74 - ELSE (NOT WIN32)
75 - GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
76 - INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime)
77 - ENDIF (NOT WIN32)
78 -
79 - ENDFOREACH(qtlib)
80 -ENDIF(NOT Q_WS_MAC)
81 +#IF(NOT Q_WS_MAC)
82 +# FOREACH(qtlib ${QTLIBLIST})
83 +# IF (NOT WIN32)
84 +# #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR})
85 +# GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
86 +# GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
87 +# FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
88 +# INSTALL(CODE "
89 +#MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\")
90 +#EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
91 +# COMMAND tar c ${QT_LIB_LIST}
92 +# COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
93 +# " COMPONENT Runtime)
94 +# ELSE (NOT WIN32)
95 +# GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
96 +# INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime)
97 +# ENDIF (NOT WIN32)
98 +#
99 +# ENDFOREACH(qtlib)
100 +#ENDIF(NOT Q_WS_MAC)
101
102 # Hard-coded install rules for anything left to install. These should
103 # probably go to a local cmake file. Change to match the build system's
104 diff -ru ParaView3/Applications/StreamingParaView/CMakeLists.txt ParaView3.new/Applications/StreamingParaView/CMakeLists.txt
105 --- ParaView3/Applications/StreamingParaView/CMakeLists.txt 2009-07-20 15:36:15.000000000 -0400
106 +++ ParaView3.new/Applications/StreamingParaView/CMakeLists.txt 2009-07-22 18:36:49.000000000 -0400
107 @@ -198,26 +198,26 @@
108 SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT)
109 ENDIF (WIN32)
110
111 -IF(NOT Q_WS_MAC)
112 - FOREACH(qtlib ${QTLIBLIST})
113 - IF (NOT WIN32)
114 +#IF(NOT Q_WS_MAC)
115 +# FOREACH(qtlib ${QTLIBLIST})
116 +# IF (NOT WIN32)
117 #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR})
118 - GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
119 - GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
120 - FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
121 - INSTALL(CODE "
122 -MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\")
123 -EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
124 - COMMAND tar c ${QT_LIB_LIST}
125 - COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
126 - " COMPONENT Runtime)
127 - ELSE (NOT WIN32)
128 - GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
129 - INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime)
130 - ENDIF (NOT WIN32)
131 + # GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
132 + #GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
133 + # FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
134 + # INSTALL(CODE "
135 + #MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\")
136 + #EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
137 + # COMMAND tar c ${QT_LIB_LIST}
138 + # COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
139 + # " COMPONENT Runtime)
140 + # ELSE (NOT WIN32)
141 + #GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
142 + #INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime)
143 + # ENDIF (NOT WIN32)
144
145 - ENDFOREACH(qtlib)
146 -ENDIF(NOT Q_WS_MAC)
147 + # ENDFOREACH(qtlib)
148 + #ENDIF(NOT Q_WS_MAC)
149
150 # Hard-coded install rules for anything left to install. These should
151 # probably go to a local cmake file. Change to match the build system's
152
153
154
155 1.1 sci-visualization/paraview/files/paraview-3.6.1-assistant.patch
156
157 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.1-assistant.patch?rev=1.1&view=markup
158 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.1-assistant.patch?rev=1.1&content-type=text/plain
159
160 Index: paraview-3.6.1-assistant.patch
161 ===================================================================
162 diff -Naur ParaView3/Applications/OverView/Core/MainWindow.cxx ParaView3.new/Applications/OverView/Core/MainWindow.cxx
163 --- ParaView3/Applications/OverView/Core/MainWindow.cxx 2009-07-20 15:36:12.000000000 -0400
164 +++ ParaView3.new/Applications/OverView/Core/MainWindow.cxx 2009-07-22 23:42:53.000000000 -0400
165 @@ -933,7 +933,7 @@
166 QString assistantExe;
167 QString profileFile;
168
169 - const char* assistantName = "assistant";
170 + const char* assistantName = "paraview-assistant";
171 #if defined(Q_WS_WIN)
172 const char* binDir = "\\";
173 const char* binDir1 = "\\..\\";
174 diff -Naur ParaView3/Qt/Components/pqClientMainWindow.cxx ParaView3.new/Qt/Components/pqClientMainWindow.cxx
175 --- ParaView3/Qt/Components/pqClientMainWindow.cxx 2009-07-20 15:37:39.000000000 -0400
176 +++ ParaView3.new/Qt/Components/pqClientMainWindow.cxx 2009-07-22 23:44:37.000000000 -0400
177 @@ -989,7 +989,7 @@
178 QString assistantExe;
179 QString profileFile;
180
181 - const char* assistantName = "assistant";
182 + const char* assistantName = "paraview-assistant";
183 #if defined(Q_WS_WIN)
184 const char* extString = ".exe";
185 const char* binDir = "\\";
186
187
188
189 1.1 sci-visualization/paraview/files/paraview-3.6.1-hdf-1.8.3.patch
190
191 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.1-hdf-1.8.3.patch?rev=1.1&view=markup
192 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.1-hdf-1.8.3.patch?rev=1.1&content-type=text/plain
193
194 Index: paraview-3.6.1-hdf-1.8.3.patch
195 ===================================================================
196 diff -Naur ParaView3/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx ParaView3.new/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx
197 --- ParaView3/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2009-07-20 15:39:10.000000000 -0400
198 +++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2009-07-22 16:05:22.000000000 -0400
199 @@ -132,9 +132,15 @@
200 static herr_t H5FD_dsm_flush(H5FD_t *_file);
201 #endif
202 static int H5FD_dsm_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
203 +#ifdef H5_USE_16_API
204 +static haddr_t H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t);
205 +static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t, haddr_t addr);
206 +static haddr_t H5FD_dsm_get_eof(const H5FD_t *_file);
207 +#else
208 static haddr_t H5FD_dsm_get_eoa(H5FD_t *_file);
209 static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr);
210 static haddr_t H5FD_dsm_get_eof(H5FD_t *_file);
211 +#endif
212 static herr_t H5FD_dsm_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
213 DSM_HSIZE_T size, void *buf);
214 static herr_t H5FD_dsm_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
215 @@ -159,6 +165,7 @@
216 H5FD_dsm_close, /*close */
217 H5FD_dsm_cmp, /*cmp */
218 NULL, /*query */
219 + NULL, /*type map */
220 NULL, /*alloc */
221 NULL, /*free */
222 H5FD_dsm_get_eoa, /*get_eoa */
223 @@ -168,6 +175,7 @@
224 H5FD_dsm_read, /*read */
225 H5FD_dsm_write, /*write */
226 NULL, /*flush */
227 + NULL, /*truncate */
228 NULL, /*lock */
229 NULL, /*unlock */
230 H5FD_FLMAP_SINGLE /*fl_map */
231 @@ -594,7 +602,11 @@
232 *-------------------------------------------------------------------------
233 */
234 static haddr_t
235 +#ifdef H5_USE_16_API
236 +H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t)
237 +#else
238 H5FD_dsm_get_eoa(H5FD_t *_file)
239 +#endif
240 {
241 H5FD_dsm_t *file = (H5FD_dsm_t*)_file;
242
243 @@ -622,7 +634,11 @@
244 *-------------------------------------------------------------------------
245 */
246 static herr_t
247 +#ifdef H5_USE_16_API
248 +H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t, haddr_t addr)
249 +#else
250 H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr)
251 +#endif
252 {
253 H5FD_dsm_t *file = (H5FD_dsm_t*)_file;
254
255 @@ -663,7 +679,11 @@
256 *-------------------------------------------------------------------------
257 */
258 static haddr_t
259 +#ifdef H5_USE_16_API
260 +H5FD_dsm_get_eof(const H5FD_t *_file)
261 +#else
262 H5FD_dsm_get_eof(H5FD_t *_file)
263 +#endif
264 {
265 H5FD_dsm_t *file = (H5FD_dsm_t*)_file;
266
267
268
269
270 1.1 sci-visualization/paraview/files/paraview-3.6.1-pointsprite-disable.patch
271
272 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.1-pointsprite-disable.patch?rev=1.1&view=markup
273 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.1-pointsprite-disable.patch?rev=1.1&content-type=text/plain
274
275 Index: paraview-3.6.1-pointsprite-disable.patch
276 ===================================================================
277 diff -Naur ParaView3/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt ParaView3.new/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt
278 --- ParaView3/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt 2009-07-20 15:37:07.000000000 -0400
279 +++ ParaView3.new/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt 2009-07-21 11:42:56.000000000 -0400
280 @@ -5,6 +5,6 @@
281
282 target_link_libraries(${exe} CSCS_PointSprite_Rendering vtkIO)
283
284 -install(TARGETS ${exe}
285 - RUNTIME DESTINATION ${PROJECT_BINARY_DIR}
286 -)
287 +#install(TARGETS ${exe}
288 +# RUNTIME DESTINATION ${PROJECT_BINARY_DIR}
289 +#)
290
291
292
293 1.1 sci-visualization/paraview/files/paraview-3.6.1-qt.patch
294
295 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.1-qt.patch?rev=1.1&view=markup
296 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.1-qt.patch?rev=1.1&content-type=text/plain
297
298 Index: paraview-3.6.1-qt.patch
299 ===================================================================
300 diff -Naur ParaView3/Applications/Client/CMakeLists.txt ParaView3.new/Applications/Client/CMakeLists.txt
301 --- ParaView3/Applications/Client/CMakeLists.txt 2009-07-20 15:36:01.000000000 -0400
302 +++ ParaView3.new/Applications/Client/CMakeLists.txt 2009-07-22 22:38:09.000000000 -0400
303 @@ -499,54 +499,54 @@
304
305 # Install system libraries on Linux (will not work on any other Unix
306 # yet)
307 -FOREACH(fmpglib avcodec avformat avutil)
308 - IF(FFMPEG_${fmpglib}_LIBRARY)
309 - GET_FILENAME_COMPONENT(FFMPEG_LIB_DIR_tmp ${FFMPEG_${fmpglib}_LIBRARY} PATH)
310 - GET_FILENAME_COMPONENT(FFMPEG_LIB_NAME_tmp ${FFMPEG_${fmpglib}_LIBRARY} NAME)
311 - FILE(GLOB FFMPEG_LIB_LIST RELATIVE ${FFMPEG_LIB_DIR_tmp} "${FFMPEG_${fmpglib}_LIBRARY}*")
312 - INSTALL(CODE "
313 -MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${FFMPEG_LIB_NAME_tmp}\")
314 -EXECUTE_PROCESS (WORKING_DIRECTORY ${FFMPEG_LIB_DIR_tmp}
315 - COMMAND tar c ${FFMPEG_LIB_LIST}
316 - COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
317 - " COMPONENT Runtime)
318 - #INSTALL(FILES ${FFMPEG_${fmpglib}_LIBRARY} DESTINATION ${PV_INSTALL_LIB_DIR})
319 +#FOREACH(fmpglib avcodec avformat avutil)
320 +# IF(FFMPEG_${fmpglib}_LIBRARY)
321 +# GET_FILENAME_COMPONENT(FFMPEG_LIB_DIR_tmp ${FFMPEG_${fmpglib}_LIBRARY} PATH)
322 +# GET_FILENAME_COMPONENT(FFMPEG_LIB_NAME_tmp ${FFMPEG_${fmpglib}_LIBRARY} NAME)
323 +# FILE(GLOB FFMPEG_LIB_LIST RELATIVE ${FFMPEG_LIB_DIR_tmp} "${FFMPEG_${fmpglib}_LIBRARY}*")
324 +# INSTALL(CODE "
325 +#MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${FFMPEG_LIB_NAME_tmp}\")
326 +#EXECUTE_PROCESS (WORKING_DIRECTORY ${FFMPEG_LIB_DIR_tmp}
327 +# COMMAND tar c ${FFMPEG_LIB_LIST}
328 +# COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
329 +# " COMPONENT Runtime)
330 +# #INSTALL(FILES ${FFMPEG_${fmpglib}_LIBRARY} DESTINATION ${PV_INSTALL_LIB_DIR})
331
332 - ENDIF(FFMPEG_${fmpglib}_LIBRARY)
333 -ENDFOREACH(fmpglib)
334 +# ENDIF(FFMPEG_${fmpglib}_LIBRARY)
335 +#ENDFOREACH(fmpglib)
336
337 -SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST QTSQL)
338 +#SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST QTSQL)
339 # the variable and library names are not the same
340 -IF (WIN32)
341 - SET (QTLIBLIST ${QTLIBLIST} QTASSISTANTCLIENT)
342 -ELSE (WIN32)
343 - SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT)
344 -ENDIF (WIN32)
345 +#IF (WIN32)
346 +# SET (QTLIBLIST ${QTLIBLIST} QTASSISTANTCLIENT)
347 +#ELSE (WIN32)
348 +# SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT)
349 +#ENDIF (WIN32)
350
351 IF (VTK_USE_QVTK_QTOPENGL)
352 SET (QTLIBLIST ${QTLIBLIST} QTOPENGL)
353 ENDIF (VTK_USE_QVTK_QTOPENGL)
354
355 -IF(NOT Q_WS_MAC)
356 - FOREACH(qtlib ${QTLIBLIST})
357 - IF (NOT WIN32)
358 - #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR})
359 - GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
360 - GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
361 - FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
362 - INSTALL(CODE "
363 -MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\")
364 -EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
365 - COMMAND tar c ${QT_LIB_LIST}
366 - COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
367 - " COMPONENT Runtime)
368 - ELSE (NOT WIN32)
369 - GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
370 - INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime)
371 - ENDIF (NOT WIN32)
372 +#IF(NOT Q_WS_MAC)
373 +# FOREACH(qtlib ${QTLIBLIST})
374 +# IF (NOT WIN32)
375 +# #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR})
376 +# GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
377 +# GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
378 +# FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
379 +# INSTALL(CODE "
380 +#MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\")
381 +#EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
382 +# COMMAND tar c ${QT_LIB_LIST}
383 +# COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
384 +# " COMPONENT Runtime)
385 +# ELSE (NOT WIN32)
386 +# GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
387 +# INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime)
388 +# ENDIF (NOT WIN32)
389
390 - ENDFOREACH(qtlib)
391 -ENDIF(NOT Q_WS_MAC)
392 +# ENDFOREACH(qtlib)
393 +#ENDIF(NOT Q_WS_MAC)
394
395 # Hard-coded install rules for anything left to install. These should
396 # probably go to a local cmake file. Change to match the build system's
397 diff -Naur ParaView3/Applications/StreamingParaView/CMakeLists.txt ParaView3.new/Applications/StreamingParaView/CMakeLists.txt
398 --- ParaView3/Applications/StreamingParaView/CMakeLists.txt 2009-07-20 15:36:15.000000000 -0400
399 +++ ParaView3.new/Applications/StreamingParaView/CMakeLists.txt 2009-07-22 22:39:14.000000000 -0400
400 @@ -198,26 +198,26 @@
401 SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT)
402 ENDIF (WIN32)
403
404 -IF(NOT Q_WS_MAC)
405 - FOREACH(qtlib ${QTLIBLIST})
406 - IF (NOT WIN32)
407 - #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR})
408 - GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
409 - GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
410 - FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
411 - INSTALL(CODE "
412 -MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\")
413 -EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
414 - COMMAND tar c ${QT_LIB_LIST}
415 - COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
416 - " COMPONENT Runtime)
417 - ELSE (NOT WIN32)
418 - GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
419 - INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime)
420 - ENDIF (NOT WIN32)
421 -
422 - ENDFOREACH(qtlib)
423 -ENDIF(NOT Q_WS_MAC)
424 +#IF(NOT Q_WS_MAC)
425 +# FOREACH(qtlib ${QTLIBLIST})
426 +# IF (NOT WIN32)
427 +# #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR})
428 +# GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
429 +# GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
430 +# FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
431 +# INSTALL(CODE "
432 +#MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\")
433 +#EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
434 +# COMMAND tar c ${QT_LIB_LIST}
435 +# COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
436 +# " COMPONENT Runtime)
437 +# ELSE (NOT WIN32)
438 +# GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
439 +# INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime)
440 +# ENDIF (NOT WIN32)
441 +#
442 +# ENDFOREACH(qtlib)
443 +#ENDIF(NOT Q_WS_MAC)
444
445 # Hard-coded install rules for anything left to install. These should
446 # probably go to a local cmake file. Change to match the build system's
Report Message
Find on MARC Find on Google Groups