diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2006-05-18 16:08:55 +0000 |
|---|---|---|
| committer | Peter Kümmel <syntheticpp@gmx.net> | 2006-05-18 16:08:55 +0000 |
| commit | 3ba9a9978013acb1e14de68399ec66a5893762ea (patch) | |
| tree | e73a231403c8fe86bb0e9da56b5f2fe2bc3e308c | |
| parent | cb5c1d9679c303b34367d3cef2ba83258fb6c00c (diff) | |
| download | extra-cmake-modules-3ba9a9978013acb1e14de68399ec66a5893762ea.tar.gz extra-cmake-modules-3ba9a9978013acb1e14de68399ec66a5893762ea.tar.bz2 | |
Fix debug/release link problem for msvc.
Make two steps to be more clear:
1. revert to cmake's cvs version.
2. add changes for msvc
this is step 2.
CCMAIL:Paulo.Guedes@artelecom.pt
CCMAIL:neundorf@kde.org
svn path=/trunk/KDE/kdelibs/; revision=542213
| -rw-r--r-- | modules/FindQt4.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 2ae35870..659faf19 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -598,7 +598,11 @@ 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}) + IF(NOT MSVC) + SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY_RELEASE}) + ELSE(NOT MSVC) + SET(QT_${basename}_LIBRARY optimized ${QT_${basename}_LIBRARY_RELEASE} debug ${QT_${basename}_LIBRARY_DEBUG}) + ENDIF(NOT MSVC) SET(QT_${basename}_LIBRARIES optimized ${QT_${basename}_LIBRARY_RELEASE} debug ${QT_${basename}_LIBRARY_DEBUG}) ENDIF (QT_${basename}_LIBRARY_DEBUG AND QT_${basename}_LIBRARY_RELEASE) |