diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-09 14:37:12 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-01-09 14:37:12 (GMT) |
| commit | df55a930fa2a2af933a351efe0a24dd2f958a541 (patch) | |
| tree | 0ee1c6fd294ce90faf8e3d7cf1833fff37ef0466 /Modules | |
| parent | e5783a6f5144bf167534c72641c85a8af9a687a9 (diff) | |
| parent | e8b8b37ef6fef094940d3384df5a1d421b9fa568 (diff) | |
| download | CMake-df55a930fa2a2af933a351efe0a24dd2f958a541.zip CMake-df55a930fa2a2af933a351efe0a24dd2f958a541.tar.gz CMake-df55a930fa2a2af933a351efe0a24dd2f958a541.tar.bz2 | |
Merge topic 'qt4-find-root'
e8b8b37 FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already rooted.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt4.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 28b8454..46d3741 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -761,7 +761,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) set(QT_MKSPECS_DIR NOTFOUND) find_path(QT_MKSPECS_DIR NAMES qconfig.pri 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() if(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri") @@ -917,7 +918,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) endforeach() find_path(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer 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 () # ask qmake for the translations directory @@ -937,6 +939,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) find_path(QT_IMPORTS_DIR NAMES Qt HINTS ${qt_cross_paths} ${qt_imports_dir} 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_SYSTEM_PATH) mark_as_advanced(QT_IMPORTS_DIR) |