diff options
| author | click <none@none> | 2010-08-30 11:50:48 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-08-30 11:50:48 +0200 |
| commit | b0d85ac1858ecc162adb08a8de1b3da68121ce64 (patch) | |
| tree | d2a86cd658c125f2dc80d67efc2d5d95df80753c /cmake/compiler | |
| parent | b53cec3d5b2283b6c2eafeb34c656351c4966ada (diff) | |
Buildsystem/MSVC: Reinstate regular flags, seems like C++-flags and C-flags doesn't mix very well on MSVC
--HG--
branch : trunk
Diffstat (limited to 'cmake/compiler')
| -rw-r--r-- | cmake/compiler/msvc/settings.cmake | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index 04ba7279a51..34245bd576f 100644 --- a/cmake/compiler/msvc/settings.cmake +++ b/cmake/compiler/msvc/settings.cmake @@ -45,12 +45,8 @@ message(STATUS "- MSVC: Enabled extended object-support for debug-compiles") # disable warnings in Visual Studio 8 and above if not wanted if(NOT WITH_WARNINGS) if(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619") message(STATUS "- MSVC: Disabled generic compiletime warnings") endif() endif() - -# Copy CMAKE_CX_FLAGS to CMAKE_C_FLAGS to avoid inconsistency -set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}") -set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") -message(STATUS "- MSVC: Copied CXX_FLAGS to C_FLAGS (consistency)") |