[Cmake-commits] [cmake-commits] alex committed FindQt3.cmake 1.18 1.19
cmake-commits at cmake.org
cmake-commits at cmake.org
Sat Aug 16 17:14:03 EDT 2008
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv19624
Modified Files:
FindQt3.cmake
Log Message:
STYLE: remove some unnecessary lines
STYLE: everything uppercase in this file
Alex
Index: FindQt3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt3.cmake,v
retrieving revision 1.18
retrieving revision 1.19
diff -C 2 -d -r1.18 -r1.19
*** FindQt3.cmake 18 Jun 2008 12:37:32 -0000 1.18
--- FindQt3.cmake 16 Aug 2008 21:14:01 -0000 1.19
***************
*** 35,39 ****
C:/Progra~1/qt/include
/usr/include/qt3
- /usr/X11R6/include
)
--- 35,38 ----
***************
*** 74,78 ****
/usr/share/qt3/lib
C:/Progra~1/qt/lib
- /usr/X11R6/lib
)
--- 73,76 ----
***************
*** 95,106 ****
/usr/share/qt3/lib
C:/Progra~1/qt/lib
- /usr/X11R6/lib
)
ENDIF (QT_MT_REQUIRED)
- IF(QT_QT_LIBRARY)
- ELSE(QT_QT_LIBRARY)
- ENDIF(QT_QT_LIBRARY)
-
FIND_LIBRARY(QT_QASSISTANTCLIENT_LIBRARY
--- 93,99 ----
***************
*** 117,121 ****
/usr/share/qt3/lib
C:/Progra~1/qt/lib
- /usr/X11R6/lib
)
--- 110,113 ----
***************
*** 141,145 ****
IF(QT_MOC_EXECUTABLE)
SET ( QT_WRAP_CPP "YES")
- ELSE(QT_MOC_EXECUTABLE)
ENDIF(QT_MOC_EXECUTABLE)
--- 133,136 ----
***************
*** 163,167 ****
IF(QT_UIC_EXECUTABLE)
SET ( QT_WRAP_UI "YES")
- ELSE(QT_UIC_EXECUTABLE)
ENDIF(QT_UIC_EXECUTABLE)
--- 154,157 ----
***************
*** 195,199 ****
# req = "6.5.4", qt = "3.2.1"
! macro(error_message msg)
IF(QT3_REQUIRED)
MESSAGE( FATAL_ERROR ${msg})
--- 185,189 ----
# req = "6.5.4", qt = "3.2.1"
! MACRO(error_message msg)
IF(QT3_REQUIRED)
MESSAGE( FATAL_ERROR ${msg})
***************
*** 201,208 ****
MESSAGE( STATUS ${msg})
ENDIF(QT3_REQUIRED)
! endmacro(error_message)
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
ELSE (req_qt_major_vers GREATER qt_major_vers) # no
IF (req_qt_major_vers LESS qt_major_vers) # (6 < 3) ?
--- 191,198 ----
MESSAGE( STATUS ${msg})
ENDIF(QT3_REQUIRED)
! ENDMACRO(error_message)
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
ELSE (req_qt_major_vers GREATER qt_major_vers) # no
IF (req_qt_major_vers LESS qt_major_vers) # (6 < 3) ?
***************
*** 210,214 ****
ELSE (req_qt_major_vers LESS qt_major_vers) # ( 6==3) ?
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
ELSE (req_qt_minor_vers GREATER qt_minor_vers) # no
IF (req_qt_minor_vers LESS qt_minor_vers) # (5<2) ?
--- 200,204 ----
ELSE (req_qt_major_vers LESS qt_major_vers) # ( 6==3) ?
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
ELSE (req_qt_minor_vers GREATER qt_minor_vers) # no
IF (req_qt_minor_vers LESS qt_minor_vers) # (5<2) ?
***************
*** 216,220 ****
ELSE (req_qt_minor_vers LESS qt_minor_vers) # (5==2)
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
ELSE (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ?
SET( QT_VERSION_BIG_ENOUGH "YES" ) # yes
--- 206,210 ----
ELSE (req_qt_minor_vers LESS qt_minor_vers) # (5==2)
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
ELSE (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ?
SET( QT_VERSION_BIG_ENOUGH "YES" ) # yes
***************
*** 227,235 ****
# if the include a library are found then we have it
! IF(QT_INCLUDE_DIR)
! IF(QT_QT_LIBRARY)
! SET( QT_FOUND "YES" )
! ENDIF(QT_QT_LIBRARY)
! ENDIF(QT_INCLUDE_DIR)
IF(QT_FOUND)
--- 217,223 ----
# if the include a library are found then we have it
! IF(QT_INCLUDE_DIR AND QT_QT_LIBRARY)
! SET( QT_FOUND "YES" )
! ENDIF(QT_INCLUDE_DIR AND QT_QT_LIBRARY)
IF(QT_FOUND)
***************
*** 294,309 ****
SET(QT_WRAP_CPP FALSE)
! IF (QT_MOC_EXECUTABLE)
! IF(_QT_MOC_VERSION_3)
! SET ( QT_WRAP_CPP TRUE)
! ENDIF(_QT_MOC_VERSION_3)
! ENDIF (QT_MOC_EXECUTABLE)
SET(QT_WRAP_UI FALSE)
! IF (QT_UIC_EXECUTABLE)
! IF(_QT_UIC_VERSION_3)
! SET ( QT_WRAP_UI TRUE)
! ENDIF(_QT_UIC_VERSION_3)
! ENDIF (QT_UIC_EXECUTABLE)
MARK_AS_ADVANCED(
--- 282,293 ----
SET(QT_WRAP_CPP FALSE)
! IF (QT_MOC_EXECUTABLE AND _QT_MOC_VERSION_3)
! SET ( QT_WRAP_CPP TRUE)
! ENDIF (QT_MOC_EXECUTABLE AND _QT_MOC_VERSION_3)
SET(QT_WRAP_UI FALSE)
! IF (QT_UIC_EXECUTABLE AND _QT_UIC_VERSION_3)
! SET ( QT_WRAP_UI TRUE)
! ENDIF (QT_UIC_EXECUTABLE AND _QT_UIC_VERSION_3)
MARK_AS_ADVANCED(
More information about the Cmake-commits
mailing list