diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2006-05-18 16:03:36 +0000 |
|---|---|---|
| committer | Peter Kümmel <syntheticpp@gmx.net> | 2006-05-18 16:03:36 +0000 |
| commit | cb5c1d9679c303b34367d3cef2ba83258fb6c00c (patch) | |
| tree | 987b3d863afda0aab41aec6822112a5b3e7af3c0 | |
| parent | 629745908dbb7203d356cae1798e28dbd34a0f65 (diff) | |
| download | extra-cmake-modules-cb5c1d9679c303b34367d3cef2ba83258fb6c00c.tar.gz extra-cmake-modules-cb5c1d9679c303b34367d3cef2ba83258fb6c00c.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 1.
CCMAIL:Paulo.Guedes@artelecom.pt
CCMAIL:neundorf@kde.org
svn path=/trunk/KDE/kdelibs/; revision=542211
| -rw-r--r-- | modules/FindQt4.cmake | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index e8c7235a..2ae35870 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -598,13 +598,8 @@ 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) - 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) + SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY_RELEASE}) + SET(QT_${basename}_LIBRARIES optimized ${QT_${basename}_LIBRARY_RELEASE} debug ${QT_${basename}_LIBRARY_DEBUG}) ENDIF (QT_${basename}_LIBRARY_DEBUG AND QT_${basename}_LIBRARY_RELEASE) SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY} CACHE FILEPATH "The Qt ${basename} library") |