diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2007-12-13 16:49:41 +0000 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2007-12-13 16:49:41 +0000 |
| commit | db08754bea97155040936a3800c9155716861e0b (patch) | |
| tree | 2ede61b1f4ced22f0fe2a90828b10f6297359936 | |
| parent | 2888061c7f86731e7c6d2e6e2c75e7bf2bdf0c1b (diff) | |
| download | extra-cmake-modules-db08754bea97155040936a3800c9155716861e0b.tar.gz extra-cmake-modules-db08754bea97155040936a3800c9155716861e0b.tar.bz2 | |
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
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 16 |
1 files changed, 12 insertions, 4 deletions
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) |