[Bf-blender-cvs] [01f5601fe5a] master: Fix build for Intel compiler with C++11.

Milan Jaros noreply at git.blender.org
Mon Jul 23 14:23:04 CEST 2018


Commit: 01f5601fe5aee395676ecc743c1b8a48b366f404
Author: Milan Jaros
Date:   Mon Jul 23 14:20:06 2018 +0200
Branches: master
https://developer.blender.org/rB01f5601fe5aee395676ecc743c1b8a48b366f404

Fix build for Intel compiler with C++11.

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index da333286478..4de98860a61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1615,7 +1615,11 @@ if(WITH_PYTHON)
 endif()
 
 if(WITH_CXX11)
-	if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+	if(
+		CMAKE_COMPILER_IS_GNUCC OR
+		CMAKE_C_COMPILER_ID MATCHES "Clang" OR
+		CMAKE_C_COMPILER_ID MATCHES "Intel"
+	)
 		# TODO(sergey): Do we want c++11 or gnu-c++11 here?
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 	elseif(MSVC)



More information about the Bf-blender-cvs mailing list