Buildsystem/MSVC: Reinstate regular flags, seems like C++-flags and C-flags doesn't mix very well on MSVC
--HG-- branch : trunk
This commit is contained in:
1 parent
b53cec3d5b
commit
b0d85ac185
1 file changed
+1
-5
@@ -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)")
|
||||
Reference in new issue
Block a user