blob: f9993a0b830e9f4d7f4e3c9faa54773520b22ac9 (
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
|
diff -Naur ParaView3/Applications/Client/CMakeLists.txt ParaView3.new/Applications/Client/CMakeLists.txt
--- ParaView3/Applications/Client/CMakeLists.txt 2008-04-01 12:47:19.000000000 -0400
+++ ParaView3.new/Applications/Client/CMakeLists.txt 2008-05-15 12:23:11.000000000 -0400
@@ -516,34 +516,34 @@
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(NOT Q_WS_MAC)
- FOREACH(qtlib ${QTLIBLIST})
- IF (NOT WIN32)
- #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR_CM24})
- 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_CM24}/${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_CM24})
- " 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_CM24} COMPONENT Runtime)
- ENDIF (NOT WIN32)
-
- ENDFOREACH(qtlib)
-ENDIF(NOT Q_WS_MAC)
+#IF(NOT Q_WS_MAC)
+# FOREACH(qtlib ${QTLIBLIST})
+# IF (NOT WIN32)
+# #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR_CM24})
+# 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_CM24}/${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_CM24})
+# " 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_CM24} COMPONENT Runtime)
+# ENDIF (NOT WIN32)
+#
+# 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
