From 3ba9a9978013acb1e14de68399ec66a5893762ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Thu, 18 May 2006 16:08:55 +0000 Subject: 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 --- modules/FindQt4.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'modules/FindQt4.cmake') 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) -- cgit v1.2.1