mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-31 19:00:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindQt3: Restore missing lib and bin path suffixes

Browse Source 
Restore path suffixes incorrectly removed by commit a62d50ec56 (Modules:
Replace coded PATHS with PATH_SUFFIXES, 2017-11-20, v3.11.0-rc1~293^2).
Hints do not participate in the usual bin/lib subdirectory search that
`<PackangeName>_ROOT` or `CMAKE_PREFIX_PATH` exhibit.

Fixes: #19185
This commit is contained in:
Christian Pfeiffer
2019-04-20 20:37:36 +02:00
committed by Brad King
parent 5e98111643
commit c298c4553b
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/FindQt3.cmake
View File

@@ -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 ()