diff options
| author | Brad King <brad.king@kitware.com> | 2020-12-14 13:36:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-12-14 13:38:16 (GMT) |
| commit | 38fce6d23b1def9775c6473415c144dbccaa2a97 (patch) | |
| tree | cd6f3873a38d8d36aaabf2a746652a6fb40b4304 /Modules | |
| parent | 82b25be80afc92da045d04a37e121a3fa97392c0 (diff) | |
| download | CMake-38fce6d23b1def9775c6473415c144dbccaa2a97.zip CMake-38fce6d23b1def9775c6473415c144dbccaa2a97.tar.gz CMake-38fce6d23b1def9775c6473415c144dbccaa2a97.tar.bz2 | |
FindQt3: Add missing NAMES/PATHS keywords to find_ calls
These are needed when using `PATH_SUFFIXES` to get the full signatures.
Fixes: #21594
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt3.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake index b5bc8b1..da82e59 100644 --- a/Modules/FindQt3.cmake +++ b/Modules/FindQt3.cmake @@ -56,7 +56,9 @@ file(GLOB GLOB_PATHS /usr/lib/qt-3*) foreach(GLOB_PATH ${GLOB_PATHS}) list(APPEND GLOB_PATHS_BIN "${GLOB_PATH}/bin") endforeach() -find_path(QT_INCLUDE_DIR qt.h +find_path(QT_INCLUDE_DIR + NAMES qt.h + PATHS "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" @@ -179,7 +181,8 @@ if(QT_UIC_EXECUTABLE) endif() if (WIN32) - find_library(QT_QTMAIN_LIBRARY qtmain + find_library(QT_QTMAIN_LIBRARY + NAMES qtmain HINTS ENV QTDIR "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]" |