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

STYLE: remove some unnecessary lines

Browse Source 
STYLE: everything uppercase in this file

Alex
This commit is contained in:
Alexander Neundorf 2008-08-16 17:14:01 -04:00
parent 9ead2fd67a
commit bf4b0bfdd7
1 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Modules/FindQt3.cmake
View File

@ -34,7 +34,6 @@ FIND_PATH(QT_INCLUDE_DIR qt.h
/usr/share/qt3/include /usr/share/qt3/include
C:/Progra~1/qt/include C:/Progra~1/qt/include
/usr/include/qt3 /usr/include/qt3
/usr/X11R6/include
) )
# if qglobal.h is not in the qt_include_dir then set # if qglobal.h is not in the qt_include_dir then set
@ -73,7 +72,6 @@ IF (QT_MT_REQUIRED)
/usr/lib/qt3/lib64 /usr/lib/qt3/lib64
/usr/share/qt3/lib /usr/share/qt3/lib
C:/Progra~1/qt/lib C:/Progra~1/qt/lib
/usr/X11R6/lib
) )
ELSE (QT_MT_REQUIRED) ELSE (QT_MT_REQUIRED)
@ -94,14 +92,9 @@ ELSE (QT_MT_REQUIRED)
/usr/lib/qt3/lib64 /usr/lib/qt3/lib64
/usr/share/qt3/lib /usr/share/qt3/lib
C:/Progra~1/qt/lib C:/Progra~1/qt/lib
/usr/X11R6/lib
) )
ENDIF (QT_MT_REQUIRED) ENDIF (QT_MT_REQUIRED)
IF(QT_QT_LIBRARY)
ELSE(QT_QT_LIBRARY)
ENDIF(QT_QT_LIBRARY)
FIND_LIBRARY(QT_QASSISTANTCLIENT_LIBRARY FIND_LIBRARY(QT_QASSISTANTCLIENT_LIBRARY
NAMES qassistantclient NAMES qassistantclient
@ -116,7 +109,6 @@ FIND_LIBRARY(QT_QASSISTANTCLIENT_LIBRARY
/usr/lib/qt3/lib64 /usr/lib/qt3/lib64
/usr/share/qt3/lib /usr/share/qt3/lib
C:/Progra~1/qt/lib C:/Progra~1/qt/lib
/usr/X11R6/lib
) )
# qt 3 should prefer QTDIR over the PATH # qt 3 should prefer QTDIR over the PATH
@ -140,7 +132,6 @@ FIND_PROGRAM(QT_MOC_EXECUTABLE
IF(QT_MOC_EXECUTABLE) IF(QT_MOC_EXECUTABLE)
SET ( QT_WRAP_CPP "YES") SET ( QT_WRAP_CPP "YES")
ELSE(QT_MOC_EXECUTABLE)
ENDIF(QT_MOC_EXECUTABLE) ENDIF(QT_MOC_EXECUTABLE)
# qt 3 should prefer QTDIR over the PATH # qt 3 should prefer QTDIR over the PATH
@ -162,7 +153,6 @@ FIND_PROGRAM(QT_UIC_EXECUTABLE uic
IF(QT_UIC_EXECUTABLE) IF(QT_UIC_EXECUTABLE)
SET ( QT_WRAP_UI "YES") SET ( QT_WRAP_UI "YES")
ELSE(QT_UIC_EXECUTABLE)
ENDIF(QT_UIC_EXECUTABLE) ENDIF(QT_UIC_EXECUTABLE)
IF (WIN32) IF (WIN32)
@ -194,28 +184,28 @@ IF (QT_MIN_VERSION)
STRING(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" req_qt_patch_vers "${QT_MIN_VERSION}") STRING(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" req_qt_patch_vers "${QT_MIN_VERSION}")
# req = "6.5.4", qt = "3.2.1" # req = "6.5.4", qt = "3.2.1"
macro(error_message msg) MACRO(error_message msg)
IF(QT3_REQUIRED) IF(QT3_REQUIRED)
MESSAGE( FATAL_ERROR ${msg}) MESSAGE( FATAL_ERROR ${msg})
ELSE(QT3_REQUIRED) ELSE(QT3_REQUIRED)
MESSAGE( STATUS ${msg}) MESSAGE( STATUS ${msg})
ENDIF(QT3_REQUIRED) ENDIF(QT3_REQUIRED)
endmacro(error_message) ENDMACRO(error_message)
IF (req_qt_major_vers GREATER qt_major_vers) # (6 > 3) ? IF (req_qt_major_vers GREATER qt_major_vers) # (6 > 3) ?
error_message( "Qt major version not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes ERROR_MESSAGE( "Qt major version not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes
ELSE (req_qt_major_vers GREATER qt_major_vers) # no ELSE (req_qt_major_vers GREATER qt_major_vers) # no
IF (req_qt_major_vers LESS qt_major_vers) # (6 < 3) ? IF (req_qt_major_vers LESS qt_major_vers) # (6 < 3) ?
SET( QT_VERSION_BIG_ENOUGH "YES" ) # yes SET( QT_VERSION_BIG_ENOUGH "YES" ) # yes
ELSE (req_qt_major_vers LESS qt_major_vers) # ( 6==3) ? ELSE (req_qt_major_vers LESS qt_major_vers) # ( 6==3) ?
IF (req_qt_minor_vers GREATER qt_minor_vers) # (5>2) ? IF (req_qt_minor_vers GREATER qt_minor_vers) # (5>2) ?
error_message( "Qt minor version not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes ERROR_MESSAGE( "Qt minor version not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes
ELSE (req_qt_minor_vers GREATER qt_minor_vers) # no ELSE (req_qt_minor_vers GREATER qt_minor_vers) # no
IF (req_qt_minor_vers LESS qt_minor_vers) # (5<2) ? IF (req_qt_minor_vers LESS qt_minor_vers) # (5<2) ?
SET( QT_VERSION_BIG_ENOUGH "YES" ) # yes SET( QT_VERSION_BIG_ENOUGH "YES" ) # yes
ELSE (req_qt_minor_vers LESS qt_minor_vers) # (5==2) ELSE (req_qt_minor_vers LESS qt_minor_vers) # (5==2)
IF (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ? IF (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ?
error_message( "Qt patch level not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes ERROR_MESSAGE( "Qt patch level not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes
ELSE (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ? ELSE (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ?
SET( QT_VERSION_BIG_ENOUGH "YES" ) # yes SET( QT_VERSION_BIG_ENOUGH "YES" ) # yes
ENDIF (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ? ENDIF (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ?
@ -226,11 +216,9 @@ IF (QT_MIN_VERSION)
ENDIF (QT_MIN_VERSION) ENDIF (QT_MIN_VERSION)
# if the include a library are found then we have it # if the include a library are found then we have it
IF(QT_INCLUDE_DIR) IF(QT_INCLUDE_DIR AND QT_QT_LIBRARY)
IF(QT_QT_LIBRARY) SET( QT_FOUND "YES" )
SET( QT_FOUND "YES" ) ENDIF(QT_INCLUDE_DIR AND QT_QT_LIBRARY)
ENDIF(QT_QT_LIBRARY)
ENDIF(QT_INCLUDE_DIR)
IF(QT_FOUND) IF(QT_FOUND)
SET( QT_LIBRARIES ${QT_LIBRARIES} ${QT_QT_LIBRARY} ) SET( QT_LIBRARIES ${QT_LIBRARIES} ${QT_QT_LIBRARY} )
@ -293,18 +281,14 @@ IF("${QTVERSION_MOC}" MATCHES ".* 3..*")
ENDIF("${QTVERSION_MOC}" MATCHES ".* 3..*") ENDIF("${QTVERSION_MOC}" MATCHES ".* 3..*")
SET(QT_WRAP_CPP FALSE) SET(QT_WRAP_CPP FALSE)
IF (QT_MOC_EXECUTABLE) IF (QT_MOC_EXECUTABLE AND _QT_MOC_VERSION_3)
IF(_QT_MOC_VERSION_3) SET ( QT_WRAP_CPP TRUE)
SET ( QT_WRAP_CPP TRUE) ENDIF (QT_MOC_EXECUTABLE AND _QT_MOC_VERSION_3)
ENDIF(_QT_MOC_VERSION_3)
ENDIF (QT_MOC_EXECUTABLE)
SET(QT_WRAP_UI FALSE) SET(QT_WRAP_UI FALSE)
IF (QT_UIC_EXECUTABLE) IF (QT_UIC_EXECUTABLE AND _QT_UIC_VERSION_3)
IF(_QT_UIC_VERSION_3) SET ( QT_WRAP_UI TRUE)
SET ( QT_WRAP_UI TRUE) ENDIF (QT_UIC_EXECUTABLE AND _QT_UIC_VERSION_3)
ENDIF(_QT_UIC_VERSION_3)
ENDIF (QT_UIC_EXECUTABLE)
MARK_AS_ADVANCED( MARK_AS_ADVANCED(
QT_INCLUDE_DIR QT_INCLUDE_DIR