ENH: Allow users to recover from trying to use an improperly installed Qt
without removing their cache, fixing their environment and trying again.
This commit is contained in:
parent
f2c6e9e480
commit
c39a8c39aa
|
@ -383,32 +383,32 @@ IF (QT4_QMAKE_FOUND)
|
||||||
ENDIF (APPLE)
|
ENDIF (APPLE)
|
||||||
|
|
||||||
# ask qmake for the binary dir
|
# ask qmake for the binary dir
|
||||||
IF (NOT QT_BINARY_DIR)
|
IF (QT_LIBRARY_DIR AND NOT QT_BINARY_DIR)
|
||||||
EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
|
EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
|
||||||
ARGS "-query QT_INSTALL_BINS"
|
ARGS "-query QT_INSTALL_BINS"
|
||||||
OUTPUT_VARIABLE qt_bins )
|
OUTPUT_VARIABLE qt_bins )
|
||||||
SET(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "")
|
SET(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "")
|
||||||
ENDIF (NOT QT_BINARY_DIR)
|
ENDIF (QT_LIBRARY_DIR AND NOT QT_BINARY_DIR)
|
||||||
|
|
||||||
# ask qmake for the include dir
|
# ask qmake for the include dir
|
||||||
IF (NOT QT_HEADERS_DIR)
|
IF (QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR)
|
||||||
EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
|
EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
|
||||||
ARGS "-query QT_INSTALL_HEADERS"
|
ARGS "-query QT_INSTALL_HEADERS"
|
||||||
OUTPUT_VARIABLE qt_headers )
|
OUTPUT_VARIABLE qt_headers )
|
||||||
SET(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "")
|
SET(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "")
|
||||||
ENDIF(NOT QT_HEADERS_DIR)
|
ENDIF(QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR)
|
||||||
|
|
||||||
|
|
||||||
# ask qmake for the documentation directory
|
# ask qmake for the documentation directory
|
||||||
IF (NOT QT_DOC_DIR)
|
IF (QT_LIBRARY_DIR AND NOT QT_DOC_DIR)
|
||||||
EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
|
EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
|
||||||
ARGS "-query QT_INSTALL_DOCS"
|
ARGS "-query QT_INSTALL_DOCS"
|
||||||
OUTPUT_VARIABLE qt_doc_dir )
|
OUTPUT_VARIABLE qt_doc_dir )
|
||||||
SET(QT_DOC_DIR ${qt_doc_dir} CACHE PATH "The location of the Qt docs")
|
SET(QT_DOC_DIR ${qt_doc_dir} CACHE PATH "The location of the Qt docs")
|
||||||
ENDIF (NOT QT_DOC_DIR)
|
ENDIF (QT_LIBRARY_DIR AND NOT QT_DOC_DIR)
|
||||||
|
|
||||||
# ask qmake for the mkspecs directory
|
# ask qmake for the mkspecs directory
|
||||||
IF (NOT QT_MKSPECS_DIR)
|
IF (QT_LIBRARY_DIR AND NOT QT_MKSPECS_DIR)
|
||||||
EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
|
EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
|
||||||
ARGS "-query QMAKE_MKSPECS"
|
ARGS "-query QMAKE_MKSPECS"
|
||||||
OUTPUT_VARIABLE qt_mkspecs_dirs )
|
OUTPUT_VARIABLE qt_mkspecs_dirs )
|
||||||
|
@ -416,15 +416,15 @@ IF (QT4_QMAKE_FOUND)
|
||||||
FIND_PATH(QT_MKSPECS_DIR qconfig.pri PATHS ${qt_mkspecs_dirs}
|
FIND_PATH(QT_MKSPECS_DIR qconfig.pri PATHS ${qt_mkspecs_dirs}
|
||||||
DOC "The location of the Qt mkspecs containing qconfig.pri"
|
DOC "The location of the Qt mkspecs containing qconfig.pri"
|
||||||
NO_DEFAULT_PATH )
|
NO_DEFAULT_PATH )
|
||||||
ENDIF (NOT QT_MKSPECS_DIR)
|
ENDIF (QT_LIBRARY_DIR AND NOT QT_MKSPECS_DIR)
|
||||||
|
|
||||||
# ask qmake for the plugins directory
|
# ask qmake for the plugins directory
|
||||||
IF (NOT QT_PLUGINS_DIR)
|
IF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR)
|
||||||
EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
|
EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
|
||||||
ARGS "-query QT_INSTALL_PLUGINS"
|
ARGS "-query QT_INSTALL_PLUGINS"
|
||||||
OUTPUT_VARIABLE qt_plugins_dir )
|
OUTPUT_VARIABLE qt_plugins_dir )
|
||||||
SET(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins")
|
SET(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins")
|
||||||
ENDIF (NOT QT_PLUGINS_DIR)
|
ENDIF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR)
|
||||||
########################################
|
########################################
|
||||||
#
|
#
|
||||||
# Setting the INCLUDE-Variables
|
# Setting the INCLUDE-Variables
|
||||||
|
|
Loading…
Reference in New Issue