diff options
| author | Brad King <brad.king@kitware.com> | 2020-12-15 12:43:56 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-12-15 12:44:18 (GMT) |
| commit | 25a1cdef956e0c26067edbef3daa55ec6c65caae (patch) | |
| tree | e20494b4beb112ff8d69074e4c93f79d8eab0fd7 /Modules | |
| parent | 807c903c5585c5933074c6c10eb3a5513e83b8a5 (diff) | |
| parent | 38fce6d23b1def9775c6473415c144dbccaa2a97 (diff) | |
| download | CMake-25a1cdef956e0c26067edbef3daa55ec6c65caae.zip CMake-25a1cdef956e0c26067edbef3daa55ec6c65caae.tar.gz CMake-25a1cdef956e0c26067edbef3daa55ec6c65caae.tar.bz2 | |
Merge topic 'FindQt3-find-sig'
38fce6d23b FindQt3: Add missing NAMES/PATHS keywords to find_ calls
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5611
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]" |