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

Merge topic 'qt4-find-root' 

e8b8b37 FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already rooted.
This commit is contained in:
Brad King 2014-01-09 09:37:12 -05:00 committed by CMake Topic Stage
parent e5783a6f51 e8b8b37ef6
commit df55a930fa
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/FindQt4.cmake
View File

@ -761,7 +761,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
set(QT_MKSPECS_DIR NOTFOUND) 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"
NO_CMAKE_FIND_ROOT_PATH)
endif() endif()
if(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri") if(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
@ -917,7 +918,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
endforeach() endforeach()
find_path(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer find_path(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer
HINTS ${qt_cross_paths} ${qt_plugins_dir} HINTS ${qt_cross_paths} ${qt_plugins_dir}
DOC "The location of the Qt plugins") DOC "The location of the Qt plugins"
NO_CMAKE_FIND_ROOT_PATH)
endif () endif ()
# ask qmake for the translations directory # ask qmake for the translations directory
@ -937,6 +939,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
find_path(QT_IMPORTS_DIR NAMES Qt find_path(QT_IMPORTS_DIR NAMES Qt
HINTS ${qt_cross_paths} ${qt_imports_dir} HINTS ${qt_cross_paths} ${qt_imports_dir}
DOC "The location of the Qt imports" DOC "The location of the Qt imports"
NO_CMAKE_FIND_ROOT_PATH
NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
NO_CMAKE_SYSTEM_PATH) NO_CMAKE_SYSTEM_PATH)
mark_as_advanced(QT_IMPORTS_DIR) mark_as_advanced(QT_IMPORTS_DIR)