From fc762eb152d76e342d5930c74c627c825b25b346 Mon Sep 17 00:00:00 2001 From: Sune Vuorela Date: Sun, 27 Oct 2013 14:29:50 +0100 Subject: Qt doesn't disable the native wchar_t type any more, so also don't do it for the kde libs. --- kde-modules/KDECompilerSettings.cmake | 3 --- 1 file changed, 3 deletions(-) diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake index b745ec3c..c3a960fd 100644 --- a/kde-modules/KDECompilerSettings.cmake +++ b/kde-modules/KDECompilerSettings.cmake @@ -184,9 +184,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" OR (WIN32 AND "${CMAKE_CXX_COMPIL set (KDE4_ENABLE_EXCEPTIONS -EHsc) - # Qt disables the native wchar_t type, do it too to avoid linking issues - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Zc:wchar_t-" ) - # make sure that no header adds libcmt by default using #pragma comment(lib, "libcmt.lib") as done by mfc/afx.h _kde_insert_flag("/NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt" CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "Release with Debug Info") _kde_insert_flag("/NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt" CMAKE_EXE_LINKER_FLAGS_RELEASE "release") -- cgit v1.2.1