Attachment #265511 for bug #358317

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




              PATHS
              ${QT_HEADERS_DIR}/${QT_MODULE}
              ${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers
              NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
      )
    # phonon doesn't seem consistent, let's try phonondefs.h for some
    # installations

                PATHS
                ${QT_HEADERS_DIR}/${QT_MODULE}
                ${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers
                NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
        )
    ENDIF(${QT_MODULE} STREQUAL "phonon")
  ENDFOREACH(QT_MODULE)

    # Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR
    FIND_PATH(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt
      PATHS ${QT_HEADERS_DIR}/ActiveQt
      NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
      )
    FIND_PATH(QT_QAXSERVER_INCLUDE_DIR ActiveQt
      PATHS ${QT_HEADERS_DIR}/ActiveQt
      NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
      )
  ENDIF(Q_WS_WIN)


    PATHS
    ${QT_HEADERS_DIR}/QtDesigner
    ${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
    )
  
  # Set QT_QTASSISTANT_INCLUDE_DIR

    PATHS
    ${QT_HEADERS_DIR}/QtAssistant
    ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
    )
  
  # Set QT_QTASSISTANTCLIENT_INCLUDE_DIR

    PATHS
    ${QT_HEADERS_DIR}/QtAssistant
    ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
    )

  ########################################

    STRING(TOUPPER ${QT_MODULE} _upper_qt_module)
    FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_RELEASE 
                 NAMES ${QT_MODULE}${QT_LIBINFIX} ${QT_MODULE}${QT_LIBINFIX}4
                 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
        )
    FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_DEBUG 
                 NAMES ${QT_MODULE}${QT_LIBINFIX}_debug ${QT_MODULE}${QT_LIBINFIX}d ${QT_MODULE}${QT_LIBINFIX}d4
                 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
        )
  ENDFOREACH(QT_MODULE)


  ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE)

  # Set QT_QTDESIGNERCOMPONENTS_LIBRARY
  FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents${QT_LIBINFIX} QtDesignerComponents${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
  FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG   NAMES QtDesignerComponents${QT_LIBINFIX}_debug QtDesignerComponents${QT_LIBINFIX}d QtDesignerComponents${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)

  # Set QT_QTMAIN_LIBRARY
  IF(Q_WS_WIN)
    FIND_LIBRARY(QT_QTMAIN_LIBRARY_RELEASE NAMES qtmain${QT_LIBINFIX} PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
    FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmain${QT_LIBINFIX}d PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
  ENDIF(Q_WS_WIN)
  
  # Set QT_QTASSISTANTCLIENT_LIBRARY
  FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
  FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG   NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR}  NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
  
  # Set QT_QTASSISTANT_LIBRARY
  FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 QtAssistant${QT_LIBINFIX} QtAssistant${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
  FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG   NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 QtAssistant${QT_LIBINFIX}_debug QtAssistant${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)

  # Set QT_QTHELP_LIBRARY
  FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene${QT_LIBINFIX} QtCLucene${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
  FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_DEBUG   NAMES QtCLucene${QT_LIBINFIX}_debug QtCLucene${QT_LIBINFIX}d QtCLucene${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
  IF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTCLUCENE_LIBRARY_RELEASE)
    FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene${QT_LIBINFIX} PATHS ${QT_LIBRARY_DIR})
  ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTCLUCENE_LIBRARY_RELEASE)

  FIND_PROGRAM(QT_MOC_EXECUTABLE
    NAMES moc-qt4 moc
    PATHS ${QT_BINARY_DIR}
    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
    )

  FIND_PROGRAM(QT_UIC_EXECUTABLE
    NAMES uic-qt4 uic
    PATHS ${QT_BINARY_DIR}
    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
    )

  FIND_PROGRAM(QT_UIC3_EXECUTABLE
    NAMES uic3
    PATHS ${QT_BINARY_DIR}
    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
    )

  FIND_PROGRAM(QT_RCC_EXECUTABLE 
    NAMES rcc
    PATHS ${QT_BINARY_DIR}
    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
    )

  FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE 
    NAMES qdbuscpp2xml
    PATHS ${QT_BINARY_DIR}
    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
    )

  FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE 
    NAMES qdbusxml2cpp
    PATHS ${QT_BINARY_DIR}
    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
    )

  FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
    NAMES lupdate-qt4 lupdate
    PATHS ${QT_BINARY_DIR}
    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
    )

  FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
    NAMES lrelease-qt4 lrelease
    PATHS ${QT_BINARY_DIR}
    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
    )

  FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE
    NAMES qcollectiongenerator-qt4 qcollectiongenerator
    PATHS ${QT_BINARY_DIR}
    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
    )

  FIND_PROGRAM(QT_DESIGNER_EXECUTABLE
    NAMES designer-qt4 designer
    PATHS ${QT_BINARY_DIR}
    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
    )

  FIND_PROGRAM(QT_LINGUIST_EXECUTABLE
    NAMES linguist-qt4 linguist
    PATHS ${QT_BINARY_DIR}
    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
    )

  IF (QT_MOC_EXECUTABLE)

      IF(QT_IS_STATIC)
        FIND_LIBRARY(QT_${_upper_qt_plugin}_LIBRARY_RELEASE
                     NAMES ${QT_PLUGIN}${QT_LIBINFIX} ${QT_PLUGIN}${QT_LIBINFIX}4
                     PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
            )
        FIND_LIBRARY(QT_${_upper_qt_plugin}_LIBRARY_DEBUG
                     NAMES ${QT_PLUGIN}${QT_LIBINFIX}_debug ${QT_PLUGIN}${QT_LIBINFIX}d ${QT_PLUGIN}${QT_LIBINFIX}d4
                     PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
            )
        _QT4_ADJUST_LIB_VARS(${QT_PLUGIN})
      ELSE(QT_IS_STATIC)

        SET(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_MODULE_SUFFIX} ${CMAKE_SHARED_LIBRARY_SUFFIX})
        FIND_LIBRARY(QT_${_upper_qt_plugin}_PLUGIN_RELEASE
                     NAMES ${QT_PLUGIN}${QT_LIBINFIX} ${QT_PLUGIN}${QT_LIBINFIX}4
                     PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
            )
        FIND_LIBRARY(QT_${_upper_qt_plugin}_PLUGIN_DEBUG
                     NAMES ${QT_PLUGIN}${QT_LIBINFIX}_debug ${QT_PLUGIN}${QT_LIBINFIX}d ${QT_PLUGIN}${QT_LIBINFIX}d4
                     PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
            )
        MARK_AS_ADVANCED(QT_${_upper_qt_plugin}_PLUGIN_RELEASE QT_${_upper_qt_plugin}_PLUGIN_DEBUG)
        SET(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_DEFAULT})

Return to bug 358317

Lines 835-841 Link Here

(-)cmake-2.8.4/usr/share/cmake/Modules/FindQt4.cmake.org (-34 / +34 lines)
835	PATHS	835	PATHS
836	${QT_HEADERS_DIR}/${QT_MODULE}	836	${QT_HEADERS_DIR}/${QT_MODULE}
837	${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers	837	${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers
838	NO_DEFAULT_PATH	838	NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
839	)	839	)
840	# phonon doesn't seem consistent, let's try phonondefs.h for some	840	# phonon doesn't seem consistent, let's try phonondefs.h for some
841	# installations	841	# installations
Lines 844-850 Link Here
844	PATHS	844	PATHS
845	${QT_HEADERS_DIR}/${QT_MODULE}	845	${QT_HEADERS_DIR}/${QT_MODULE}
846	${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers	846	${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers
847	NO_DEFAULT_PATH	847	NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
848	)	848	)
849	ENDIF(${QT_MODULE} STREQUAL "phonon")	849	ENDIF(${QT_MODULE} STREQUAL "phonon")
850	ENDFOREACH(QT_MODULE)	850	ENDFOREACH(QT_MODULE)
Lines 854-864 Link Here
854	# Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR	854	# Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR
855	FIND_PATH(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt	855	FIND_PATH(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt
856	PATHS ${QT_HEADERS_DIR}/ActiveQt	856	PATHS ${QT_HEADERS_DIR}/ActiveQt
857	NO_DEFAULT_PATH	857	NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
858	)	858	)
859	FIND_PATH(QT_QAXSERVER_INCLUDE_DIR ActiveQt	859	FIND_PATH(QT_QAXSERVER_INCLUDE_DIR ActiveQt
860	PATHS ${QT_HEADERS_DIR}/ActiveQt	860	PATHS ${QT_HEADERS_DIR}/ActiveQt
861	NO_DEFAULT_PATH	861	NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
862	)	862	)
863	ENDIF(Q_WS_WIN)	863	ENDIF(Q_WS_WIN)
864		864
Lines 867-873 Link Here
867	PATHS	867	PATHS
868	${QT_HEADERS_DIR}/QtDesigner	868	${QT_HEADERS_DIR}/QtDesigner
869	${QT_LIBRARY_DIR}/QtDesigner.framework/Headers	869	${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
870	NO_DEFAULT_PATH	870	NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
871	)	871	)
872		872
873	# Set QT_QTASSISTANT_INCLUDE_DIR	873	# Set QT_QTASSISTANT_INCLUDE_DIR
Lines 875-881 Link Here
875	PATHS	875	PATHS
876	${QT_HEADERS_DIR}/QtAssistant	876	${QT_HEADERS_DIR}/QtAssistant
877	${QT_LIBRARY_DIR}/QtAssistant.framework/Headers	877	${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
878	NO_DEFAULT_PATH	878	NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
879	)	879	)
880		880
881	# Set QT_QTASSISTANTCLIENT_INCLUDE_DIR	881	# Set QT_QTASSISTANTCLIENT_INCLUDE_DIR
Lines 883-889 Link Here
883	PATHS	883	PATHS
884	${QT_HEADERS_DIR}/QtAssistant	884	${QT_HEADERS_DIR}/QtAssistant
885	${QT_LIBRARY_DIR}/QtAssistant.framework/Headers	885	${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
886	NO_DEFAULT_PATH	886	NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
887	)	887	)
888		888
889	########################################	889	########################################
Lines 897-907 Link Here
897	STRING(TOUPPER ${QT_MODULE} _upper_qt_module)	897	STRING(TOUPPER ${QT_MODULE} _upper_qt_module)
898	FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_RELEASE	898	FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_RELEASE
899	NAMES ${QT_MODULE}${QT_LIBINFIX} ${QT_MODULE}${QT_LIBINFIX}4	899	NAMES ${QT_MODULE}${QT_LIBINFIX} ${QT_MODULE}${QT_LIBINFIX}4
900	PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH	900	PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
901	)	901	)
902	FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_DEBUG	902	FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_DEBUG
903	NAMES ${QT_MODULE}${QT_LIBINFIX}_debug ${QT_MODULE}${QT_LIBINFIX}d ${QT_MODULE}${QT_LIBINFIX}d4	903	NAMES ${QT_MODULE}${QT_LIBINFIX}_debug ${QT_MODULE}${QT_LIBINFIX}d ${QT_MODULE}${QT_LIBINFIX}d4
904	PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH	904	PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
905	)	905	)
906	ENDFOREACH(QT_MODULE)	906	ENDFOREACH(QT_MODULE)
907		907
Lines 911-936 Link Here
911	ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE)	911	ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE)
912		912
913	# Set QT_QTDESIGNERCOMPONENTS_LIBRARY	913	# Set QT_QTDESIGNERCOMPONENTS_LIBRARY
914	FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents${QT_LIBINFIX} QtDesignerComponents${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)	914	FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents${QT_LIBINFIX} QtDesignerComponents${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
915	FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG NAMES QtDesignerComponents${QT_LIBINFIX}_debug QtDesignerComponents${QT_LIBINFIX}d QtDesignerComponents${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)	915	FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG NAMES QtDesignerComponents${QT_LIBINFIX}_debug QtDesignerComponents${QT_LIBINFIX}d QtDesignerComponents${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
916		916
917	# Set QT_QTMAIN_LIBRARY	917	# Set QT_QTMAIN_LIBRARY
918	IF(Q_WS_WIN)	918	IF(Q_WS_WIN)
919	FIND_LIBRARY(QT_QTMAIN_LIBRARY_RELEASE NAMES qtmain${QT_LIBINFIX} PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)	919	FIND_LIBRARY(QT_QTMAIN_LIBRARY_RELEASE NAMES qtmain${QT_LIBINFIX} PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
920	FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmain${QT_LIBINFIX}d PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)	920	FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmain${QT_LIBINFIX}d PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
921	ENDIF(Q_WS_WIN)	921	ENDIF(Q_WS_WIN)
922		922
923	# Set QT_QTASSISTANTCLIENT_LIBRARY	923	# Set QT_QTASSISTANTCLIENT_LIBRARY
924	FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)	924	FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
925	FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)	925	FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
926		926
927	# Set QT_QTASSISTANT_LIBRARY	927	# Set QT_QTASSISTANT_LIBRARY
928	FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 QtAssistant${QT_LIBINFIX} QtAssistant${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)	928	FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 QtAssistant${QT_LIBINFIX} QtAssistant${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
929	FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 QtAssistant${QT_LIBINFIX}_debug QtAssistant${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)	929	FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 QtAssistant${QT_LIBINFIX}_debug QtAssistant${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
930		930
931	# Set QT_QTHELP_LIBRARY	931	# Set QT_QTHELP_LIBRARY
932	FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene${QT_LIBINFIX} QtCLucene${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)	932	FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene${QT_LIBINFIX} QtCLucene${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
933	FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_DEBUG NAMES QtCLucene${QT_LIBINFIX}_debug QtCLucene${QT_LIBINFIX}d QtCLucene${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)	933	FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_DEBUG NAMES QtCLucene${QT_LIBINFIX}_debug QtCLucene${QT_LIBINFIX}d QtCLucene${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
934	IF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTCLUCENE_LIBRARY_RELEASE)	934	IF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTCLUCENE_LIBRARY_RELEASE)
935	FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene${QT_LIBINFIX} PATHS ${QT_LIBRARY_DIR})	935	FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene${QT_LIBINFIX} PATHS ${QT_LIBRARY_DIR})
936	ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTCLUCENE_LIBRARY_RELEASE)	936	ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTCLUCENE_LIBRARY_RELEASE)
Lines 993-1059 Link Here
993	FIND_PROGRAM(QT_MOC_EXECUTABLE	993	FIND_PROGRAM(QT_MOC_EXECUTABLE
994	NAMES moc-qt4 moc	994	NAMES moc-qt4 moc
995	PATHS ${QT_BINARY_DIR}	995	PATHS ${QT_BINARY_DIR}
996	NO_DEFAULT_PATH	996	NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
997	)	997	)
998		998
999	FIND_PROGRAM(QT_UIC_EXECUTABLE	999	FIND_PROGRAM(QT_UIC_EXECUTABLE
1000	NAMES uic-qt4 uic	1000	NAMES uic-qt4 uic
1001	PATHS ${QT_BINARY_DIR}	1001	PATHS ${QT_BINARY_DIR}
1002	NO_DEFAULT_PATH	1002	NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
1003	)	1003	)
1004		1004
1005	FIND_PROGRAM(QT_UIC3_EXECUTABLE	1005	FIND_PROGRAM(QT_UIC3_EXECUTABLE
1006	NAMES uic3	1006	NAMES uic3
1007	PATHS ${QT_BINARY_DIR}	1007	PATHS ${QT_BINARY_DIR}
1008	NO_DEFAULT_PATH	1008	NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
1009	)	1009	)
1010		1010
1011	FIND_PROGRAM(QT_RCC_EXECUTABLE	1011	FIND_PROGRAM(QT_RCC_EXECUTABLE
1012	NAMES rcc	1012	NAMES rcc
1013	PATHS ${QT_BINARY_DIR}	1013	PATHS ${QT_BINARY_DIR}
1014	NO_DEFAULT_PATH	1014	NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
1015	)	1015	)
1016		1016
1017	FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE	1017	FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE
1018	NAMES qdbuscpp2xml	1018	NAMES qdbuscpp2xml
1019	PATHS ${QT_BINARY_DIR}	1019	PATHS ${QT_BINARY_DIR}
1020	NO_DEFAULT_PATH	1020	NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
1021	)	1021	)
1022		1022
1023	FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE	1023	FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE
1024	NAMES qdbusxml2cpp	1024	NAMES qdbusxml2cpp
1025	PATHS ${QT_BINARY_DIR}	1025	PATHS ${QT_BINARY_DIR}
1026	NO_DEFAULT_PATH	1026	NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
1027	)	1027	)
1028		1028
1029	FIND_PROGRAM(QT_LUPDATE_EXECUTABLE	1029	FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
1030	NAMES lupdate-qt4 lupdate	1030	NAMES lupdate-qt4 lupdate
1031	PATHS ${QT_BINARY_DIR}	1031	PATHS ${QT_BINARY_DIR}
1032	NO_DEFAULT_PATH	1032	NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
1033	)	1033	)
1034		1034
1035	FIND_PROGRAM(QT_LRELEASE_EXECUTABLE	1035	FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
1036	NAMES lrelease-qt4 lrelease	1036	NAMES lrelease-qt4 lrelease
1037	PATHS ${QT_BINARY_DIR}	1037	PATHS ${QT_BINARY_DIR}
1038	NO_DEFAULT_PATH	1038	NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
1039	)	1039	)
1040		1040
1041	FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE	1041	FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE
1042	NAMES qcollectiongenerator-qt4 qcollectiongenerator	1042	NAMES qcollectiongenerator-qt4 qcollectiongenerator
1043	PATHS ${QT_BINARY_DIR}	1043	PATHS ${QT_BINARY_DIR}
1044	NO_DEFAULT_PATH	1044	NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
1045	)	1045	)
1046		1046
1047	FIND_PROGRAM(QT_DESIGNER_EXECUTABLE	1047	FIND_PROGRAM(QT_DESIGNER_EXECUTABLE
1048	NAMES designer-qt4 designer	1048	NAMES designer-qt4 designer
1049	PATHS ${QT_BINARY_DIR}	1049	PATHS ${QT_BINARY_DIR}
1050	NO_DEFAULT_PATH	1050	NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
1051	)	1051	)
1052		1052
1053	FIND_PROGRAM(QT_LINGUIST_EXECUTABLE	1053	FIND_PROGRAM(QT_LINGUIST_EXECUTABLE
1054	NAMES linguist-qt4 linguist	1054	NAMES linguist-qt4 linguist
1055	PATHS ${QT_BINARY_DIR}	1055	PATHS ${QT_BINARY_DIR}
1056	NO_DEFAULT_PATH	1056	NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
1057	)	1057	)
1058		1058
1059	IF (QT_MOC_EXECUTABLE)	1059	IF (QT_MOC_EXECUTABLE)
Lines 1158-1168 Link Here
1158	IF(QT_IS_STATIC)	1158	IF(QT_IS_STATIC)
1159	FIND_LIBRARY(QT_${_upper_qt_plugin}_LIBRARY_RELEASE	1159	FIND_LIBRARY(QT_${_upper_qt_plugin}_LIBRARY_RELEASE
1160	NAMES ${QT_PLUGIN}${QT_LIBINFIX} ${QT_PLUGIN}${QT_LIBINFIX}4	1160	NAMES ${QT_PLUGIN}${QT_LIBINFIX} ${QT_PLUGIN}${QT_LIBINFIX}4
1161	PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH	1161	PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
1162	)	1162	)
1163	FIND_LIBRARY(QT_${_upper_qt_plugin}_LIBRARY_DEBUG	1163	FIND_LIBRARY(QT_${_upper_qt_plugin}_LIBRARY_DEBUG
1164	NAMES ${QT_PLUGIN}${QT_LIBINFIX}_debug ${QT_PLUGIN}${QT_LIBINFIX}d ${QT_PLUGIN}${QT_LIBINFIX}d4	1164	NAMES ${QT_PLUGIN}${QT_LIBINFIX}_debug ${QT_PLUGIN}${QT_LIBINFIX}d ${QT_PLUGIN}${QT_LIBINFIX}d4
1165	PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH	1165	PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
1166	)	1166	)
1167	_QT4_ADJUST_LIB_VARS(${QT_PLUGIN})	1167	_QT4_ADJUST_LIB_VARS(${QT_PLUGIN})
1168	ELSE(QT_IS_STATIC)	1168	ELSE(QT_IS_STATIC)
Lines 1171-1181 Link Here
1171	SET(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_MODULE_SUFFIX} ${CMAKE_SHARED_LIBRARY_SUFFIX})	1171	SET(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_MODULE_SUFFIX} ${CMAKE_SHARED_LIBRARY_SUFFIX})
1172	FIND_LIBRARY(QT_${_upper_qt_plugin}_PLUGIN_RELEASE	1172	FIND_LIBRARY(QT_${_upper_qt_plugin}_PLUGIN_RELEASE
1173	NAMES ${QT_PLUGIN}${QT_LIBINFIX} ${QT_PLUGIN}${QT_LIBINFIX}4	1173	NAMES ${QT_PLUGIN}${QT_LIBINFIX} ${QT_PLUGIN}${QT_LIBINFIX}4
1174	PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH	1174	PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
1175	)	1175	)
1176	FIND_LIBRARY(QT_${_upper_qt_plugin}_PLUGIN_DEBUG	1176	FIND_LIBRARY(QT_${_upper_qt_plugin}_PLUGIN_DEBUG
1177	NAMES ${QT_PLUGIN}${QT_LIBINFIX}_debug ${QT_PLUGIN}${QT_LIBINFIX}d ${QT_PLUGIN}${QT_LIBINFIX}d4	1177	NAMES ${QT_PLUGIN}${QT_LIBINFIX}_debug ${QT_PLUGIN}${QT_LIBINFIX}d ${QT_PLUGIN}${QT_LIBINFIX}d4
1178	PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH	1178	PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
1179	)	1179	)
1180	MARK_AS_ADVANCED(QT_${_upper_qt_plugin}_PLUGIN_RELEASE QT_${_upper_qt_plugin}_PLUGIN_DEBUG)	1180	MARK_AS_ADVANCED(QT_${_upper_qt_plugin}_PLUGIN_RELEASE QT_${_upper_qt_plugin}_PLUGIN_DEBUG)
1181	SET(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_DEFAULT})	1181	SET(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_DEFAULT})