diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-01-08 16:06:42 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-01-08 16:06:42 (GMT) |
| commit | 512c4b93c71b124744f782cd30587a07de78b270 (patch) | |
| tree | 2bf43e3a7dec37f5218fee879868f954eb885176 | |
| parent | 2acf553a8c3e679de0f7b3cc81812bd0b0417516 (diff) | |
| download | CMake-512c4b93c71b124744f782cd30587a07de78b270.zip CMake-512c4b93c71b124744f782cd30587a07de78b270.tar.gz CMake-512c4b93c71b124744f782cd30587a07de78b270.tar.bz2 | |
ENH: last change for 2.4.8 branch, I hope, fix for findqt
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ChangeLog.manual | 2 | ||||
| -rw-r--r-- | Modules/FindQt4.cmake | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 922a506..5c0abf5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ SET(CMake_VERSION_MAJOR 2) SET(CMake_VERSION_MINOR 4) SET(CMake_VERSION_PATCH 8) # for an actual release this should not be defined -SET(CMake_VERSION_RC 9) +SET(CMake_VERSION_RC 10) SET(CMake_VERSION "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}") SET(CMake_VERSION_FULL "${CMake_VERSION}.${CMake_VERSION_PATCH}") diff --git a/ChangeLog.manual b/ChangeLog.manual index 3177b19..f8cbd61 100644 --- a/ChangeLog.manual +++ b/ChangeLog.manual @@ -1,3 +1,5 @@ +Changes in CMake 2.4.8 RC 10 +* Fix for FindQt4 and glib and gthread, if not found don't use Changes in CMake 2.4.8 RC 9 * add some descriptive text to the mac installer Changes in CMake 2.4.8 RC 8 diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 981fd11..4563387 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -1230,8 +1230,10 @@ IF (QT4_QMAKE_FOUND) # Qt 4.2.0 uses glib-2.0 (wish we could ask Qt that it uses 2.0) FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0) FIND_LIBRARY(QT_GTHREAD_LIBRARY NAMES gthread-2.0) - SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} + IF(QT_GTHREAD_LIBRARY AND QT_GLIB_LIBRARY) #TEMP: need more robust find of glib2 + SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY}) + ENDIF(QT_GTHREAD_LIBRARY AND QT_GLIB_LIBRARY) MARK_AS_ADVANCED(QT_GLIB_LIBRARY) MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY) ENDIF(QT_QCONFIG MATCHES "glib") |