kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: #3514: qt-mt3.lib wasn't found on windows 

STYLE: remove some (now) unnecessary /usr/lib, /usr/local/lib, /usr/include
and /usr/local/include search paths

Alex
This commit is contained in:
Alexander Neundorf 2006-08-27 13:59:18 -04:00
parent a30e054641
commit bc266c1afd
1 changed files with 33 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/FindQt3.cmake
View File

@ -28,10 +28,8 @@ FIND_PATH(QT_INCLUDE_DIR qt.h
$ENV{QTDIR}/include $ENV{QTDIR}/include
${GLOB_PATHS_BIN} ${GLOB_PATHS_BIN}
/usr/local/qt/include /usr/local/qt/include
/usr/local/include
/usr/lib/qt/include /usr/lib/qt/include
/usr/include/qt /usr/include/qt
/usr/include
/usr/share/qt3/include /usr/share/qt3/include
C:/Progra~1/qt/include C:/Progra~1/qt/include
/usr/include/qt3 /usr/include/qt3
@ -61,7 +59,7 @@ IF (QT_MT_REQUIRED)
FIND_LIBRARY(QT_QT_LIBRARY FIND_LIBRARY(QT_QT_LIBRARY
NAMES NAMES
qt-mt qt-mt${qt_version_str_lib} qt-mtnc${qt_version_str_lib} qt-mt qt-mt${qt_version_str_lib} qt-mtnc${qt_version_str_lib}
qt-mtedu${qt_version_str_lib} qt-mt230nc qt-mtnc321 qt-mtedu${qt_version_str_lib} qt-mt230nc qt-mtnc321 qt-mt3
PATHS PATHS
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib"
@ -69,9 +67,7 @@ IF (QT_MT_REQUIRED)
$ENV{QTDIR}/lib $ENV{QTDIR}/lib
${GLOB_PATHS_LIB} ${GLOB_PATHS_LIB}
/usr/local/qt/lib /usr/local/qt/lib
/usr/local/lib
/usr/lib/qt/lib /usr/lib/qt/lib
/usr/lib
/usr/share/qt3/lib /usr/share/qt3/lib
C:/Progra~1/qt/lib C:/Progra~1/qt/lib
/usr/X11R6/lib /usr/X11R6/lib
@ -82,7 +78,7 @@ ELSE (QT_MT_REQUIRED)
NAMES NAMES
qt qt-${qt_version_str_lib} qt-edu${qt_version_str_lib} qt qt-${qt_version_str_lib} qt-edu${qt_version_str_lib}
qt-mt qt-mt${qt_version_str_lib} qt-mtnc${qt_version_str_lib} qt-mt qt-mt${qt_version_str_lib} qt-mtnc${qt_version_str_lib}
qt-mtedu${qt_version_str_lib} qt-mt230nc qt-mtnc321 qt-mtedu${qt_version_str_lib} qt-mt230nc qt-mtnc321 qt-mt3
PATHS PATHS
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib"
@ -90,9 +86,7 @@ ELSE (QT_MT_REQUIRED)
$ENV{QTDIR}/lib $ENV{QTDIR}/lib
${GLOB_PATHS_LIB} ${GLOB_PATHS_LIB}
/usr/local/qt/lib /usr/local/qt/lib
/usr/local/lib
/usr/lib/qt/lib /usr/lib/qt/lib
/usr/lib
/usr/share/qt3/lib /usr/share/qt3/lib
C:/Progra~1/qt/lib C:/Progra~1/qt/lib
/usr/X11R6/lib /usr/X11R6/lib
@ -113,8 +107,6 @@ FIND_LIBRARY(QT_QASSISTANTCLIENT_LIBRARY
$ENV{QTDIR}/lib $ENV{QTDIR}/lib
${GLOB_PATHS_LIB} ${GLOB_PATHS_LIB}
/usr/local/qt/lib /usr/local/qt/lib
/usr/local/lib
/usr/lib
/usr/share/qt3/lib /usr/share/qt3/lib
C:/Progra~1/qt/lib C:/Progra~1/qt/lib
/usr/X11R6/lib /usr/X11R6/lib