Attachment #193834 for bug #273086

View | Details | Raw Unified | Return to bug 273086
Collapse All | Expand All




  ENDIF(FFMPEG_${fmpglib}_LIBRARY)
ENDFOREACH(fmpglib)

#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(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




    MESSAGE(SEND_ERROR "Qt ${QT_MIN_VERSION} or greater not found.  Please check the QT_QMAKE_EXECUTABLE variable.")
  ELSE(NOT QT4_FOUND)
    # don't go greater than supported version
    STRING(REGEX MATCH "^4\\.3\\.[0-9]+" qt_version_tmp "${QTVERSION}")
    IF (NOT qt_version_tmp)
      STRING(REGEX MATCH "^4\\.[0-9]+\\.[0-9]+" qt_version4_x_tmp "${QTVERSION}")
      IF (NOT qt_version4_x_tmp)
        MESSAGE(SEND_ERROR "Qt ${QTVERSION} not supported.  Please use Qt 4.3 (you may need to clean your dirtied cache).")
      ELSE (NOT qt_version4_x_tmp)
        MESSAGE("WARNING: You are using Qt ${QTVERSION}. Officially supported version is Qt 4.3")
      ENDIF (NOT qt_version4_x_tmp)
    ENDIF (NOT qt_version_tmp)
    # enforce Carbon in VTK for Qt/Mac
    IF(Q_WS_MAC)

Return to bug 273086

Lines 516-549 Link Here

(-)ParaView3/Applications/Client/CMakeLists.txt (-24 / +24 lines)
516	ENDIF(FFMPEG_${fmpglib}_LIBRARY)	516	ENDIF(FFMPEG_${fmpglib}_LIBRARY)
517	ENDFOREACH(fmpglib)	517	ENDFOREACH(fmpglib)
518		518
519	SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST QTSQL)	519	#SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST QTSQL)
520	# the variable and library names are not the same	520	# the variable and library names are not the same
521	IF (WIN32)	521	#IF (WIN32)
522	SET (QTLIBLIST ${QTLIBLIST} QTASSISTANTCLIENT)	522	# SET (QTLIBLIST ${QTLIBLIST} QTASSISTANTCLIENT)
523	ELSE (WIN32)	523	#ELSE (WIN32)
524	SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT)	524	# SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT)
525	ENDIF (WIN32)	525	#ENDIF (WIN32)
526		526
527	IF(NOT Q_WS_MAC)	527	#IF(NOT Q_WS_MAC)
528	FOREACH(qtlib ${QTLIBLIST})	528	# FOREACH(qtlib ${QTLIBLIST})
529	IF (NOT WIN32)	529	# IF (NOT WIN32)
530	#INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR_CM24})	530	#INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR_CM24})
531	GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)	531	# GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
532	GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)	532	# GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
533	FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")	533	#FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
534	INSTALL(CODE "	534	# INSTALL(CODE "
535	MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}/${QT_LIB_NAME_tmp}\")	535	#MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}/${QT_LIB_NAME_tmp}\")
536	EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}	536	#EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
537	COMMAND tar c ${QT_LIB_LIST}	537	# COMMAND tar c ${QT_LIB_LIST}
538	COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24})	538	# COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24})
539	" COMPONENT Runtime)	539	# " COMPONENT Runtime)
540	ELSE (NOT WIN32)	540	# ELSE (NOT WIN32)
541	GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)	541	# GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
542	INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR_CM24} COMPONENT Runtime)	542	# INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR_CM24} COMPONENT Runtime)
543	ENDIF (NOT WIN32)	543	# ENDIF (NOT WIN32)
544		544
545	ENDFOREACH(qtlib)	545	# ENDFOREACH(qtlib)
546	ENDIF(NOT Q_WS_MAC)	546	#ENDIF(NOT Q_WS_MAC)
547		547
548	# Hard-coded install rules for anything left to install. These should	548	# Hard-coded install rules for anything left to install. These should
549	# probably go to a local cmake file. Change to match the build system's	549	# probably go to a local cmake file. Change to match the build system's

Lines 89-102 Link Here

(-)ParaView3/CMakeLists.txt (-4 / +4 lines)
89	MESSAGE(SEND_ERROR "Qt ${QT_MIN_VERSION} or greater not found. Please check the QT_QMAKE_EXECUTABLE variable.")	89	MESSAGE(SEND_ERROR "Qt ${QT_MIN_VERSION} or greater not found. Please check the QT_QMAKE_EXECUTABLE variable.")
90	ELSE(NOT QT4_FOUND)	90	ELSE(NOT QT4_FOUND)
91	# don't go greater than supported version	91	# don't go greater than supported version
92	STRING(REGEX MATCH "^4\\.3\\.[0-9]+" qt_version_tmp "${QTVERSION}")	92	STRING(REGEX MATCH "^4\\.3\\.[0-9]+" qt_version_tmp "${QTVERSION}")
93	IF (NOT qt_version_tmp)	93	IF (NOT qt_version_tmp)
94	STRING(REGEX MATCH "^4\\.4\\.[0-9]+" qt_version4_4_tmp "${QTVERSION}")	94	STRING(REGEX MATCH "^4\\.[0-9]+\\.[0-9]+" qt_version4_x_tmp "${QTVERSION}")
95	IF (NOT qt_version4_4_tmp)	95	IF (NOT qt_version4_x_tmp)
96	MESSAGE(SEND_ERROR "Qt ${QTVERSION} not supported. Please use Qt 4.3 (you may need to clean your dirtied cache).")	96	MESSAGE(SEND_ERROR "Qt ${QTVERSION} not supported. Please use Qt 4.3 (you may need to clean your dirtied cache).")
97	ELSE (NOT qt_version4_4_tmp)	97	ELSE (NOT qt_version4_x_tmp)
98	MESSAGE("WARNING: You are using Qt ${QTVERSION}. Officially supported version is Qt 4.3")	98	MESSAGE("WARNING: You are using Qt ${QTVERSION}. Officially supported version is Qt 4.3")
99	ENDIF (NOT qt_version4_4_tmp)	99	ENDIF (NOT qt_version4_x_tmp)
100	ENDIF (NOT qt_version_tmp)	100	ENDIF (NOT qt_version_tmp)
101	# enforce Carbon in VTK for Qt/Mac	101	# enforce Carbon in VTK for Qt/Mac
102	IF(Q_WS_MAC)	102	IF(Q_WS_MAC)