|
 |
341cf2c |
--- ParaView3.2.1/Applications/Client/CMakeLists.txt.install 2007-11-19 16:02:42.000000000 -0700
|
|
|
341cf2c |
+++ ParaView3.2.1/Applications/Client/CMakeLists.txt 2007-11-20 09:14:25.000000000 -0700
|
|
|
341cf2c |
@@ -451,53 +451,6 @@
|
|
|
341cf2c |
COMPONENT Runtime)
|
|
|
341cf2c |
ENDIF(NOT Q_WS_MAC)
|
|
|
341cf2c |
|
|
|
341cf2c |
-# Install system libraries on Linux (will not work on any other Unix
|
|
|
341cf2c |
-# yet)
|
|
|
341cf2c |
-FOREACH(fmpglib avcodec avformat avutil)
|
|
|
341cf2c |
- IF(FFMPEG_${fmpglib}_LIBRARY)
|
|
|
341cf2c |
- GET_FILENAME_COMPONENT(FFMPEG_LIB_DIR_tmp ${FFMPEG_${fmpglib}_LIBRARY} PATH)
|
|
|
341cf2c |
- GET_FILENAME_COMPONENT(FFMPEG_LIB_NAME_tmp ${FFMPEG_${fmpglib}_LIBRARY} NAME)
|
|
|
341cf2c |
- FILE(GLOB FFMPEG_LIB_LIST RELATIVE ${FFMPEG_LIB_DIR_tmp} "${FFMPEG_${fmpglib}_LIBRARY}*")
|
|
|
341cf2c |
- INSTALL(CODE "
|
|
|
341cf2c |
-MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}/${FFMPEG_LIB_NAME_tmp}\")
|
|
|
341cf2c |
-EXECUTE_PROCESS (WORKING_DIRECTORY ${FFMPEG_LIB_DIR_tmp}
|
|
|
341cf2c |
- COMMAND tar c ${FFMPEG_LIB_LIST}
|
|
|
341cf2c |
- COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24})
|
|
|
341cf2c |
- " COMPONENT Runtime)
|
|
|
341cf2c |
- #INSTALL(FILES ${FFMPEG_${fmpglib}_LIBRARY} DESTINATION ${PV_INSTALL_LIB_DIR_CM24})
|
|
|
341cf2c |
-
|
|
|
341cf2c |
- ENDIF(FFMPEG_${fmpglib}_LIBRARY)
|
|
|
341cf2c |
-ENDFOREACH(fmpglib)
|
|
|
341cf2c |
-
|
|
|
341cf2c |
-SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST)
|
|
|
341cf2c |
-# the variable and library names are not the same
|
|
|
341cf2c |
-IF (WIN32)
|
|
|
341cf2c |
- SET (QTLIBLIST ${QTLIBLIST} QTASSISTANTCLIENT)
|
|
|
341cf2c |
-ELSE (WIN32)
|
|
|
341cf2c |
- SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT)
|
|
|
341cf2c |
-ENDIF (WIN32)
|
|
|
341cf2c |
-
|
|
|
341cf2c |
-IF(NOT Q_WS_MAC)
|
|
|
341cf2c |
- FOREACH(qtlib ${QTLIBLIST})
|
|
|
341cf2c |
- IF (NOT WIN32)
|
|
|
341cf2c |
- #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR_CM24})
|
|
|
341cf2c |
- GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
|
|
|
341cf2c |
- GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
|
|
|
341cf2c |
- FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
|
|
|
341cf2c |
- INSTALL(CODE "
|
|
|
341cf2c |
-MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}/${QT_LIB_NAME_tmp}\")
|
|
|
341cf2c |
-EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
|
|
|
341cf2c |
- COMMAND tar c ${QT_LIB_LIST}
|
|
|
341cf2c |
- COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24})
|
|
|
341cf2c |
- " COMPONENT Runtime)
|
|
|
341cf2c |
- ELSE (NOT WIN32)
|
|
|
341cf2c |
- GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
|
|
|
341cf2c |
- INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR_CM24} COMPONENT Runtime)
|
|
|
341cf2c |
- ENDIF (NOT WIN32)
|
|
|
341cf2c |
-
|
|
|
341cf2c |
- ENDFOREACH(qtlib)
|
|
|
341cf2c |
-ENDIF(NOT Q_WS_MAC)
|
|
|
341cf2c |
-
|
|
|
341cf2c |
# Hard-coded install rules for anything left to install. These should
|
|
|
341cf2c |
# probably go to a local cmake file. Change to match the build system's
|
|
|
341cf2c |
# libraries
|
|
|
341cf2c |
@@ -510,21 +463,6 @@
|
|
|
341cf2c |
DESTINATION ${PV_EXE_INSTALL_CM24}
|
|
|
341cf2c |
PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ
|
|
|
341cf2c |
COMPONENT Runtime)
|
|
|
341cf2c |
-ELSE(WIN32)
|
|
|
341cf2c |
- IF (NOT Q_WS_MAC)
|
|
|
341cf2c |
- IF(PV_NEED_SHARED_FORWARD)
|
|
|
341cf2c |
- INSTALL(FILES ${QT_BINARY_DIR}/assistant
|
|
|
341cf2c |
- DESTINATION ${PV_EXE_INSTALL_CM24}
|
|
|
341cf2c |
- PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ
|
|
|
341cf2c |
- COMPONENT Runtime
|
|
|
341cf2c |
- RENAME assistant-real)
|
|
|
341cf2c |
- ELSE(PV_NEED_SHARED_FORWARD)
|
|
|
341cf2c |
- INSTALL(FILES ${QT_BINARY_DIR}/assistant
|
|
|
341cf2c |
- DESTINATION ${PV_EXE_INSTALL_CM24}
|
|
|
341cf2c |
- PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ
|
|
|
341cf2c |
- COMPONENT Runtime)
|
|
|
341cf2c |
- ENDIF(PV_NEED_SHARED_FORWARD)
|
|
|
341cf2c |
- ENDIF (NOT Q_WS_MAC)
|
|
|
341cf2c |
ENDIF(WIN32)
|
|
|
341cf2c |
|
|
|
341cf2c |
# Call this one last so that it happens after the above targets are all installed:
|