diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-22 11:39:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-04-22 11:39:34 (GMT) |
| commit | 637292a3a9b60ff4a6febe8080f47d20af787a17 (patch) | |
| tree | a31651415a59323b6109059d182e7932155036cb | |
| parent | cb23f2ac8b2484c9bf1e0db78831b3ea8d54766c (diff) | |
| parent | c298c4553becd799d924a58a33a6f59910477aad (diff) | |
| download | CMake-637292a3a9b60ff4a6febe8080f47d20af787a17.zip CMake-637292a3a9b60ff4a6febe8080f47d20af787a17.tar.gz CMake-637292a3a9b60ff4a6febe8080f47d20af787a17.tar.bz2 | |
Merge topic 'findqt3-hints-fix'
c298c4553b FindQt3: Restore missing lib and bin path suffixes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3254
| -rw-r--r-- | Modules/FindQt3.cmake | 12 |
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 () |