| View Issue Details [ Jump to Notes ] | [ Print ] |
| ID | Project | Category | View Status | Date Submitted | Last Update |
| 0012414 | CMake | Modules | public | 2011-08-20 03:52 | 2013-01-09 14:05 |
|
| Reporter | Sergei Epifanov | |
| Assigned To | Clinton Stimpson | |
| Priority | normal | Severity | major | Reproducibility | always |
| Status | closed | Resolution | fixed | |
| Platform | Intel | OS | Linux | OS Version | |
| Product Version | CMake 2.8.5 | |
| Target Version | | Fixed in Version | | |
|
| Summary | 0012414: Mistakes in FindQt3.cmake and FindQt4.cmake Qt version definition |
| Description | Files FindQt3.cmake and FindQt4.cmake have mistakes in defining required Qt version for building program. Minor version variable recieves only the first digit but not two or more. |
| Steps To Reproduce | Set QTVERSION or QT_MIN_VERSION with minor version 10 or higher. |
| Additional Information | Just compare REGEX for major version and patch variables to find the mistake. Patch is applied. |
| Tags | No tags attached. |
|
| Attached Files |  cmake-version.patch [^] (1,431 bytes) 2011-08-20 03:52 [Show Content] [Hide Content]diff -Naur cmake-2.8.5.orig/Modules/FindQt3.cmake cmake-2.8.5/Modules/FindQt3.cmake
--- cmake-2.8.5.orig/Modules/FindQt3.cmake 2011-07-08 15:12:50.000000000 +0400
+++ cmake-2.8.5/Modules/FindQt3.cmake 2011-08-20 10:41:52.195645357 +0400
@@ -206,7 +206,7 @@
ENDIF (NOT req_qt_major_vers)
STRING(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" req_qt_major_vers "${QT_MIN_VERSION}")
- STRING(REGEX REPLACE "[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" req_qt_minor_vers "${QT_MIN_VERSION}")
+ STRING(REGEX REPLACE "[0-9]+\\.([0-9]+)\\.[0-9]+" "\\1" req_qt_minor_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"
diff -Naur cmake-2.8.5.orig/Modules/FindQt4.cmake cmake-2.8.5/Modules/FindQt4.cmake
--- cmake-2.8.5.orig/Modules/FindQt4.cmake 2011-07-08 15:12:50.000000000 +0400
+++ cmake-2.8.5/Modules/FindQt4.cmake 2011-08-20 10:43:54.200005474 +0400
@@ -1122,7 +1122,7 @@
# set version variables
STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${QTVERSION}")
- STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}")
+ STRING(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}")
STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH "${QTVERSION}")
ENDIF(QT_QMAKE_EXECUTABLE AND QTVERSION)
|
|