From cb5c1d9679c303b34367d3cef2ba83258fb6c00c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Thu, 18 May 2006 16:03:36 +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 1. CCMAIL:Paulo.Guedes@artelecom.pt CCMAIL:neundorf@kde.org svn path=/trunk/KDE/kdelibs/; revision=542211 --- modules/FindQt4.cmake | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'modules') 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") -- cgit v1.2.1