diff options
| author | Brad King <brad.king@kitware.com> | 2018-03-19 09:10:24 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-03-19 09:13:25 -0400 |
| commit | cf06962d73862d3092578ff5bc7080b3e5e0a290 (patch) | |
| tree | c46d5b03f13c140ea545d7d2e632ab07ea8d048f /Modules/FindQt4.cmake | |
| parent | c5541cf0da1093635fea7da5a40e64e481b5477e (diff) | |
| download | cmake-cf06962d73862d3092578ff5bc7080b3e5e0a290.tar.gz | |
FindQt4: Revert "Set PLUGINS and IMPORTS dir even if empty"
The change in commit v3.11.0-rc1~306^2 (FindQt4: Set PLUGINS and IMPORTS
dir even if empty, 2017-11-19) regressed existing builds on some
machines. Revert it for CMake 3.11 pending further investigation.
Fixes: #17814, #17817
Issue: #14155, #17492
Diffstat (limited to 'Modules/FindQt4.cmake')
| -rw-r--r-- | Modules/FindQt4.cmake | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index a65c5337f9..5a7eadb969 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -710,19 +710,13 @@ if (QT_QMAKE_EXECUTABLE AND if (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR OR QT_QMAKE_CHANGED) _qt4_query_qmake(QT_INSTALL_PLUGINS qt_plugins_dir) set(QT_PLUGINS_DIR NOTFOUND) - set(qt_cross_paths) foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH}) set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/plugins") endforeach() - find_path(QT_PLUGINS_DIR - NAMES accessible bearer codecs designer graphicssystems iconengines imageformats inputmethods qmltooling script sqldrivers + 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" NO_CMAKE_FIND_ROOT_PATH) - # If no plugins were installed, set QT_PLUGINS_DIR to ${qt_plugins_dir} - if(NOT QT_PLUGINS_DIR AND qt_plugins_dir) - set(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins") - endif() endif () # ask qmake for the translations directory @@ -736,7 +730,6 @@ if (QT_QMAKE_EXECUTABLE AND _qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir) if(qt_imports_dir) set(QT_IMPORTS_DIR NOTFOUND) - set(qt_cross_paths) foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH}) set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/imports") endforeach() @@ -746,10 +739,6 @@ if (QT_QMAKE_EXECUTABLE AND NO_CMAKE_FIND_ROOT_PATH NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) - # If the imports folder is empty, set QT_IMPORTS_DIR to ${qt_imports_dir} - if(NOT QT_IMPORTS_DIR AND qt_imports_dir) - set(QT_IMPORTS_DIR ${qt_imports_dir} CACHE PATH "The location of the Qt imports") - endif() mark_as_advanced(QT_IMPORTS_DIR) endif() endif () |