Commit: 497c35aa7804edc8f16eeff9e82bb3985275a5bd
Author: Campbell Barton
Date: Wed Nov 11 22:53:49 2015 +1100
Branches: master
https://developer.blender.org/rB497c35aa7804edc8f16eeff9e82bb3985275a5bd
CMake: don't overwrite C/C++ flags for MSVC
Wasn't possible to define custom build flags.
This does change some of the build flags,
as far as we can tell they aren't important (see D1615).
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1204cd4..26b841f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1274,26 +1274,17 @@ elseif(WIN32)
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
include(InstallRequiredSystemLibraries)
- set(CMAKE_CXX_FLAGS "/nologo /J /Gd /EHsc /MP" CACHE STRING
"MSVC MT C++ flags " FORCE)
- set(CMAKE_C_FLAGS "/nologo /J /Gd /MP" CACHE STRING
"MSVC MT C++ flags " FORCE)
-
- if(CMAKE_CL_64)
- set(CMAKE_CXX_FLAGS_DEBUG "/Od /RTC1 /MTd /Zi /MP"
CACHE STRING "MSVC MT flags " FORCE)
- else()
- set(CMAKE_CXX_FLAGS_DEBUG "/Od /RTC1 /MTd /ZI /MP"
CACHE STRING "MSVC MT flags " FORCE)
- endif()
- set(CMAKE_CXX_FLAGS_RELEASE "/O2 /Ob2 /MT /MP" CACHE STRING
"MSVC MT flags " FORCE)
- set(CMAKE_CXX_FLAGS_MINSIZEREL "/O1 /Ob1 /MT /MP" CACHE STRING
"MSVC MT flags " FORCE)
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /MT /Zi /MP" CACHE
STRING "MSVC MT flags " FORCE)
- if(CMAKE_CL_64)
- set(CMAKE_C_FLAGS_DEBUG "/Od /RTC1 /MTd /Zi /MP" CACHE
STRING "MSVC MT flags " FORCE)
- else()
- set(CMAKE_C_FLAGS_DEBUG "/Od /RTC1 /MTd /ZI /MP" CACHE
STRING "MSVC MT flags " FORCE)
- endif()
- set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /MT /MP" CACHE STRING "MSVC
MT flags " FORCE)
- set(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /MT /MP" CACHE STRING
"MSVC MT flags " FORCE)
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /MT /Zi /MP" CACHE
STRING "MSVC MT flags " FORCE)
-
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /nologo /J /Gd /MP
/EHsc")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /nologo /J /Gd /MP")
+
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
+ set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}
/MT")
+ set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} /MT")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
"${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT")
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO
"${CMAKE_C_FLAGS_RELWITHDEBINFO} /MT")
set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152
/INCREMENTAL:NO /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib
/NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib")
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
