blob: f2ea294ed871971c781cddc04bab48452b1ff452 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
|
diff -Naur ParaView3/Applications/Client/CMakeLists.txt ParaView3.new/Applications/Client/CMakeLists.txt
--- ParaView3/Applications/Client/CMakeLists.txt 2010-01-04 10:24:37.000000000 -0500
+++ ParaView3.new/Applications/Client/CMakeLists.txt 2010-01-14 18:43:52.000000000 -0500
@@ -564,54 +564,54 @@
# Install system libraries on Linux (will not work on any other Unix
# yet)
-FOREACH(fmpglib avcodec avformat avutil)
- IF(FFMPEG_${fmpglib}_LIBRARY)
- GET_FILENAME_COMPONENT(FFMPEG_LIB_DIR_tmp ${FFMPEG_${fmpglib}_LIBRARY} PATH)
- GET_FILENAME_COMPONENT(FFMPEG_LIB_NAME_tmp ${FFMPEG_${fmpglib}_LIBRARY} NAME)
- FILE(GLOB FFMPEG_LIB_LIST RELATIVE ${FFMPEG_LIB_DIR_tmp} "${FFMPEG_${fmpglib}_LIBRARY}*")
- INSTALL(CODE "
-MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${FFMPEG_LIB_NAME_tmp}\")
-EXECUTE_PROCESS (WORKING_DIRECTORY ${FFMPEG_LIB_DIR_tmp}
- COMMAND tar c ${FFMPEG_LIB_LIST}
- COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
- " COMPONENT Runtime)
+#FOREACH(fmpglib avcodec avformat avutil)
+# IF(FFMPEG_${fmpglib}_LIBRARY)
+# GET_FILENAME_COMPONENT(FFMPEG_LIB_DIR_tmp ${FFMPEG_${fmpglib}_LIBRARY} PATH)
+# GET_FILENAME_COMPONENT(FFMPEG_LIB_NAME_tmp ${FFMPEG_${fmpglib}_LIBRARY} NAME)
+# FILE(GLOB FFMPEG_LIB_LIST RELATIVE ${FFMPEG_LIB_DIR_tmp} "${FFMPEG_${fmpglib}_LIBRARY}*")
+# INSTALL(CODE "
+#MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${FFMPEG_LIB_NAME_tmp}\")
+#EXECUTE_PROCESS (WORKING_DIRECTORY ${FFMPEG_LIB_DIR_tmp}
+# COMMAND tar c ${FFMPEG_LIB_LIST}
+# COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
+# " COMPONENT Runtime)
#INSTALL(FILES ${FFMPEG_${fmpglib}_LIBRARY} DESTINATION ${PV_INSTALL_LIB_DIR})
- ENDIF(FFMPEG_${fmpglib}_LIBRARY)
-ENDFOREACH(fmpglib)
+ # ENDIF(FFMPEG_${fmpglib}_LIBRARY)
+ #ENDFOREACH(fmpglib)
-SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST QTSQL)
+ #SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST QTSQL)
# the variable and library names are not the same
-IF (WIN32)
- SET (QTLIBLIST ${QTLIBLIST} QTASSISTANTCLIENT)
-ELSE (WIN32)
- SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT)
-ENDIF (WIN32)
+#IF (WIN32)
+# SET (QTLIBLIST ${QTLIBLIST} QTASSISTANTCLIENT)
+#ELSE (WIN32)
+# SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT)
+#ENDIF (WIN32)
IF (VTK_USE_QVTK_QTOPENGL)
SET (QTLIBLIST ${QTLIBLIST} QTOPENGL)
ENDIF (VTK_USE_QVTK_QTOPENGL)
-IF(NOT Q_WS_MAC)
- FOREACH(qtlib ${QTLIBLIST})
- IF (NOT WIN32)
- #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR})
- GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
- GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
- FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
- INSTALL(CODE "
-MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\")
-EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
- COMMAND tar c ${QT_LIB_LIST}
- COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
- " COMPONENT Runtime)
- ELSE (NOT WIN32)
- GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
- INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime)
- ENDIF (NOT WIN32)
+#IF(NOT Q_WS_MAC)
+# FOREACH(qtlib ${QTLIBLIST})
+# IF (NOT WIN32)
+# #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR})
+# GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
+# GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
+# FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
+# INSTALL(CODE "
+#MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\")
+#EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
+# COMMAND tar c ${QT_LIB_LIST}
+# COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
+# " COMPONENT Runtime)
+# ELSE (NOT WIN32)
+# GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
+# INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime)
+# ENDIF (NOT WIN32)
- ENDFOREACH(qtlib)
-ENDIF(NOT Q_WS_MAC)
+# ENDFOREACH(qtlib)
+#ENDIF(NOT Q_WS_MAC)
# Hard-coded install rules for anything left to install. These should
# probably go to a local cmake file. Change to match the build system's
diff -Naur ParaView3/Applications/StreamingParaView/CMakeLists.txt ParaView3.new/Applications/StreamingParaView/CMakeLists.txt
--- ParaView3/Applications/StreamingParaView/CMakeLists.txt 2009-03-04 09:24:27.000000000 -0500
+++ ParaView3.new/Applications/StreamingParaView/CMakeLists.txt 2010-01-14 18:44:44.000000000 -0500
@@ -198,26 +198,26 @@
SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT)
ENDIF (WIN32)
-IF(NOT Q_WS_MAC)
- FOREACH(qtlib ${QTLIBLIST})
- IF (NOT WIN32)
- #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR})
- GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
- GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
- FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
- INSTALL(CODE "
-MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\")
-EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
- COMMAND tar c ${QT_LIB_LIST}
- COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
- " COMPONENT Runtime)
- ELSE (NOT WIN32)
- GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
- INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime)
- ENDIF (NOT WIN32)
+#IF(NOT Q_WS_MAC)
+# FOREACH(qtlib ${QTLIBLIST})
+# IF (NOT WIN32)
+# #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR})
+# GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
+# GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
+# FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
+# INSTALL(CODE "
+#MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\")
+#EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
+# COMMAND tar c ${QT_LIB_LIST}
+# COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
+# " COMPONENT Runtime)
+# ELSE (NOT WIN32)
+# GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
+# INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime)
+# ENDIF (NOT WIN32)
- ENDFOREACH(qtlib)
-ENDIF(NOT Q_WS_MAC)
+# ENDFOREACH(qtlib)
+#ENDIF(NOT Q_WS_MAC)
# Hard-coded install rules for anything left to install. These should
# probably go to a local cmake file. Change to match the build system's
|
GitWeb