summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-04-22 11:35:22 (GMT)
committerBrad King <brad.king@kitware.com>2019-04-22 11:35:22 (GMT)
commitbc6f442b565318fec648c5dad15dfc3d6e855dc0 (patch)
treefb4915e1387203c0ac372636ba4f939e49ce6da6
parentcb733eb4a6e2c0246af55e3080e541d36aec3db6 (diff)
parentc298c4553becd799d924a58a33a6f59910477aad (diff)
downloadCMake-bc6f442b565318fec648c5dad15dfc3d6e855dc0.zip
CMake-bc6f442b565318fec648c5dad15dfc3d6e855dc0.tar.gz
CMake-bc6f442b565318fec648c5dad15dfc3d6e855dc0.tar.bz2
Merge branch 'findqt3-hints-fix' into release-3.14
Merge-request: !3254
-rw-r--r--Modules/FindQt3.cmake12
1 files changed, 7 insertions, 5 deletions
diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake
index 4a8e28b..563ed46 100644
--- a/Modules/FindQt3.cmake
+++ b/Modules/FindQt3.cmake
@@ -101,7 +101,7 @@ if (QT_MT_REQUIRED)
/usr/share/qt3
C:/Progra~1/qt
PATH_SUFFIXES
- lib/qt lib/qt3 qt qt3 qt/lib qt3/lib
+ lib lib/qt lib/qt3 qt qt3 qt/lib qt3/lib
)
else ()
@@ -119,7 +119,7 @@ else ()
/usr/share/qt3
C:/Progra~1/qt/lib
PATH_SUFFIXES
- lib/qt lib/qt3 qt qt3 qt/lib qt3/lib
+ lib lib/qt lib/qt3 qt qt3 qt/lib qt3/lib
)
endif ()
@@ -135,7 +135,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
/usr/share/qt3
C:/Progra~1/qt
PATH_SUFFIXES
- lib/qt lib/qt3 qt qt3 qt/lib qt3/lib
+ lib lib/qt lib/qt3 qt qt3 qt/lib qt3/lib
)
# Qt 3 should prefer QTDIR over the PATH
@@ -151,7 +151,7 @@ find_program(QT_MOC_EXECUTABLE
/usr/share/qt3
C:/Progra~1/qt
PATH_SUFFIXES
- lib/qt lib/qt3 qt qt3 qt/lib qt3/lib
+ bin lib/qt lib/qt3 qt qt3 qt/bin qt3/bin lib/qt/bin lib/qt3/bin
)
if(QT_MOC_EXECUTABLE)
@@ -171,7 +171,7 @@ find_program(QT_UIC_EXECUTABLE
/usr/share/qt3
C:/Progra~1/qt
PATH_SUFFIXES
- lib/qt lib/qt3 qt qt3 qt/lib qt3/lib
+ bin lib/qt lib/qt3 qt qt3 qt/bin qt3/bin lib/qt/bin lib/qt3/bin
)
if(QT_UIC_EXECUTABLE)
@@ -188,6 +188,8 @@ if (WIN32)
PATHS
"$ENV{ProgramFiles}/qt"
"C:/Program Files/qt"
+ PATH_SUFFIXES
+ lib
DOC "This Library is only needed by and included with Qt3 on MSWindows. It should be NOTFOUND, undefined or IGNORE otherwise."
)
endif ()