diff options
| author | Romain Pokrzywka <romain@kdab.net> | 2009-10-22 10:29:21 +0000 |
|---|---|---|
| committer | Romain Pokrzywka <romain@kdab.net> | 2009-10-22 10:29:21 +0000 |
| commit | b7bcdf9864248f723df7285d36ad9a92230f9803 (patch) | |
| tree | 4a9cf12bf185c9e815137f291fe8fc541fe02ab5 | |
| parent | ec96981bc8aa9423c82d8f426bebafdb9b657c38 (diff) | |
| download | extra-cmake-modules-b7bcdf9864248f723df7285d36ad9a92230f9803.tar.gz extra-cmake-modules-b7bcdf9864248f723df7285d36ad9a92230f9803.tar.bz2 | |
bring msvc compiler flags in sync with the flags used when building Qt
svn path=/trunk/KDE/kdelibs/; revision=1038937
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
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' |