From 38fce6d23b1def9775c6473415c144dbccaa2a97 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 14 Dec 2020 08:36:12 -0500 Subject: FindQt3: Add missing NAMES/PATHS keywords to find_ calls These are needed when using `PATH_SUFFIXES` to get the full signatures. Fixes: #21594 --- Modules/FindQt3.cmake | 7 +++++-- 1 file 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]" -- cgit v0.12