kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some issues with refinding when qmake executable is changed.

This commit is contained in:
Clinton Stimpson 2010-07-06 13:24:53 -06:00
parent 22e725fb88
commit ff888dd648
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/FindQt4.cmake
View File

@ -430,6 +430,10 @@ MACRO (_QT4_ADJUST_LIB_VARS _camelCaseBasename)
SET(QT_${basename}_FOUND 1) SET(QT_${basename}_FOUND 1)
ELSE (QT_${basename}_LIBRARY_RELEASE OR QT_${basename}_LIBRARY_DEBUG)
SET(QT_${basename}_LIBRARY "" CACHE STRING "The Qt ${basename} library" FORCE)
ENDIF (QT_${basename}_LIBRARY_RELEASE OR QT_${basename}_LIBRARY_DEBUG) ENDIF (QT_${basename}_LIBRARY_RELEASE OR QT_${basename}_LIBRARY_DEBUG)
IF (QT_${basename}_INCLUDE_DIR) IF (QT_${basename}_INCLUDE_DIR)
@ -567,6 +571,7 @@ IF (QT4_QMAKE_FOUND)
foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH}) foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH})
set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/mkspecs") set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/mkspecs")
endforeach(qt_cross_path) endforeach(qt_cross_path)
SET(QT_MKSPECS_DIR NOTFOUND)
FIND_PATH(QT_MKSPECS_DIR NAMES qconfig.pri FIND_PATH(QT_MKSPECS_DIR NAMES qconfig.pri
HINTS ${qt_cross_paths} ${qt_mkspecs_dirs} HINTS ${qt_cross_paths} ${qt_mkspecs_dirs}
DOC "The location of the Qt mkspecs containing qconfig.pri") DOC "The location of the Qt mkspecs containing qconfig.pri")
@ -592,6 +597,8 @@ IF (QT4_QMAKE_FOUND)
OUTPUT_VARIABLE QT_LIBRARY_DIR_TMP ) OUTPUT_VARIABLE QT_LIBRARY_DIR_TMP )
# make sure we have / and not \ as qmake gives on windows # make sure we have / and not \ as qmake gives on windows
FILE(TO_CMAKE_PATH "${QT_LIBRARY_DIR_TMP}" QT_LIBRARY_DIR_TMP) FILE(TO_CMAKE_PATH "${QT_LIBRARY_DIR_TMP}" QT_LIBRARY_DIR_TMP)
SET(QT_QTCORE_LIBRARY_RELEASE NOTFOUND)
SET(QT_QTCORE_LIBRARY_DEBUG NOTFOUND)
FIND_LIBRARY(QT_QTCORE_LIBRARY_RELEASE FIND_LIBRARY(QT_QTCORE_LIBRARY_RELEASE
NAMES QtCore${QT_LIBINFIX} QtCore${QT_LIBINFIX}4 NAMES QtCore${QT_LIBINFIX} QtCore${QT_LIBINFIX}4
HINTS ${QT_LIBRARY_DIR_TMP} HINTS ${QT_LIBRARY_DIR_TMP}