diff options
| author | Christian Pfeiffer <cpfeiffer@live.de> | 2017-11-20 15:29:25 (GMT) |
|---|---|---|
| committer | Christian Pfeiffer <cpfeiffer@live.de> | 2017-11-20 15:29:25 (GMT) |
| commit | a62d50ec56087bc6364c2e6c097b312167839957 (patch) | |
| tree | ccd039133f878c223a4debd63e5b369ab87dc214 /Modules/FindQt.cmake | |
| parent | fd56d6a8e637750cbf2e038bde12164962c66bc4 (diff) | |
| download | CMake-a62d50ec56087bc6364c2e6c097b312167839957.zip CMake-a62d50ec56087bc6364c2e6c097b312167839957.tar.gz CMake-a62d50ec56087bc6364c2e6c097b312167839957.tar.bz2 | |
Modules: Replace coded PATHS with PATH_SUFFIXES
Some modules assume that `/usr` and `/usr/local` are the only
`CMAKE_PREFIX_PATH` entries and explicitly enumerate all paths instead
of using `PATH_SUFFIXES` and relying on the dynamic set of prefix paths.
This commit attempts to rectify that behavior.
Diffstat (limited to 'Modules/FindQt.cmake')
| -rw-r--r-- | Modules/FindQt.cmake | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake index 4d8aea9..68dfa7d 100644 --- a/Modules/FindQt.cmake +++ b/Modules/FindQt.cmake @@ -105,13 +105,11 @@ find_file( QT4_QGLOBAL_H_FILE qglobal.h "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/include/Qt" ${qt_headers}/Qt $ENV{QTDIR}/include/Qt - /usr/local/qt/include/Qt - /usr/local/include/Qt /usr/lib/qt/include/Qt - /usr/include/Qt /usr/share/qt4/include/Qt /usr/local/include/X11/qt4/Qt - C:/Progra~1/qt/include/Qt ) + C:/Progra~1/qt/include/Qt + PATH_SUFFIXES qt/include/Qt include/Qt) if(QT4_QGLOBAL_H_FILE) set(QT4_INSTALLED TRUE) @@ -125,14 +123,10 @@ find_file( QT3_QGLOBAL_H_FILE qglobal.h C:/Qt/3.3.3Educational/include $ENV{QTDIR}/include /usr/include/qt3/Qt - /usr/local/qt/include - /usr/local/include - /usr/lib/qt/include - /usr/include /usr/share/qt3/include /usr/local/include/X11/qt3 C:/Progra~1/qt/include - /usr/include/qt3 ) + PATH_SUFFIXES qt/include include/qt3) if(QT3_QGLOBAL_H_FILE) set(QT3_INSTALLED TRUE) |