From b7bcdf9864248f723df7285d36ad9a92230f9803 Mon Sep 17 00:00:00 2001 From: Romain Pokrzywka Date: Thu, 22 Oct 2009 10:29:21 +0000 Subject: bring msvc compiler flags in sync with the flags used when building Qt svn path=/trunk/KDE/kdelibs/; revision=1038937 --- modules/FindKDE4Internal.cmake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'modules') diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 75cb9988..81563108 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -882,6 +882,10 @@ if (WIN32) # windows, microsoft compiler if(MSVC) set( _KDE4_PLATFORM_DEFINITIONS -DKDE_FULL_TEMPLATE_EXPORT_INSTANTIATION -DWIN32_LEAN_AND_MEAN ) + + # Qt disables the native wchar_t type, do it too to avoid linking issues + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Zc:wchar_t-" ) + # C4250: 'class1' : inherits 'class2::member' via dominance set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4250" ) # C4251: 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2' -- cgit v1.2.1