diff options
| author | Paulo Moura Guedes <moura@kdewebdev.org> | 2006-05-16 20:03:28 +0000 |
|---|---|---|
| committer | Paulo Moura Guedes <moura@kdewebdev.org> | 2006-05-16 20:03:28 +0000 |
| commit | 69d8e15bf7382504853bfd30eaaea457e0dbcb61 (patch) | |
| tree | 458d62b17727f1d71e272c86b32516dcfffdbfc9 | |
| parent | 6647ff1200e2493e4dffd898c17c953fec3483a6 (diff) | |
| download | extra-cmake-modules-69d8e15bf7382504853bfd30eaaea457e0dbcb61.tar.gz extra-cmake-modules-69d8e15bf7382504853bfd30eaaea457e0dbcb61.tar.bz2 | |
If we are building kdelibs with debug build type then choose the debug Qt libraries.
Before, if both were available, the release Qt libs were always chosen, which makes msvc apps crash.
I think this finnishes the build-system cycle for the win32 port, for now :)
CCMAIL: kde-buildsystem@kde.org
CCMAIL: kde-windows@kde.org
svn path=/trunk/KDE/kdelibs/; revision=541628
| -rw-r--r-- | modules/FindQt4.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 2ae35870..e8c7235a 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -598,8 +598,13 @@ IF (QT4_QMAKE_FOUND) ENDIF (QT_${basename}_LIBRARY_DEBUG AND NOT QT_${basename}_LIBRARY_RELEASE) IF (QT_${basename}_LIBRARY_DEBUG AND QT_${basename}_LIBRARY_RELEASE) - SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY_RELEASE}) - SET(QT_${basename}_LIBRARIES optimized ${QT_${basename}_LIBRARY_RELEASE} debug ${QT_${basename}_LIBRARY_DEBUG}) + IF(CMAKE_BUILD_TYPE MATCHES Debug) + SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY_DEBUG}) + SET(QT_${basename}_LIBRARIES ${QT_${basename}_LIBRARY_DEBUG}) + ELSE(CMAKE_BUILD_TYPE MATCHES Debug) + SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY_RELEASE}) + SET(QT_${basename}_LIBRARIES optimized ${QT_${basename}_LIBRARY_RELEASE} debug ${QT_${basename}_LIBRARY_DEBUG}) + ENDIF(CMAKE_BUILD_TYPE MATCHES Debug) ENDIF (QT_${basename}_LIBRARY_DEBUG AND QT_${basename}_LIBRARY_RELEASE) SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY} CACHE FILEPATH "The Qt ${basename} library") |