From db08754bea97155040936a3800c9155716861e0b Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Thu, 13 Dec 2007 16:49:41 +0000 Subject: win32 msvc fix: CMAKE_EXE_LINKER_FLAGS_... seems not to be used, instead only CMAKE_EXE_LINKER_FLAGS is used regardless of build type svn path=/trunk/KDE/kdelibs/; revision=748113 --- modules/FindKDE4Internal.cmake | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'modules/FindKDE4Internal.cmake') diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 05056f91..3028f25e 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -798,11 +798,19 @@ endif (CMAKE_SYSTEM_NAME MATCHES BSD) if (MSVC) set (KDE4_ENABLE_EXCEPTIONS -EHsc) + # check if release mode + if (CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "ReleaseWithDebInfo" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel") + set (releaseMode 1) + else (CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "ReleaseWithDebInfo" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel") + set (releaseMode 0) + endif (CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "ReleaseWithDebInfo" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel") + # make sure that no header adds libcmt by default using #pragma comment(lib, "libcmt.lib") as done by mfc/afx.h - set (CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt") - set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt") - set (CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmtd /DEFAULTLIB:msvcrtd") - set (CMAKE_EXE_LINKER_FLAGS_DEBUG_FULL "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmtd /DEFAULTLIB:msvcrtd") + if (releaseMode) + set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt") + else (releaseMode) + set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:libcmtd /DEFAULTLIB:msvcrtd") + endif (releaseMode) endif(MSVC) -- cgit v1.2.1