[Bf-blender-cvs] [73c1c92] blender2.8: Fix C++11 building on MSVC 2015

Mike Erwin noreply at git.blender.org
Tue Nov 29 08:40:52 CET 2016


Commit: 73c1c92c0e86ce1b5a8abeaa16be2bf2c259412b
Author: Mike Erwin
Date:   Tue Nov 29 02:35:46 2016 -0500
Branches: blender2.8
https://developer.blender.org/rB73c1c92c0e86ce1b5a8abeaa16be2bf2c259412b

Fix C++11 building on MSVC 2015

Newest 2017 not yet supported because i don't know its version symbol...

===================================================================

M	CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f547b0b..a7f1c00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1566,7 +1566,7 @@ if(WITH_CXX11)
 	if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
 		# TODO(sergey): Do we want c++11 or gnu-c++11 here?
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-	elseif(MSVC12)
+	elseif(MSVC14 OR MSVC12)
 		# Nothing special is needed, C++11 features are available by default.
 	else()
 		message(FATAL_ERROR "Compiler ${CMAKE_C_COMPILER_ID} is not supported for C++11 build yet")




More information about the Bf-blender-cvs mailing list