[Bf-blender-cvs] [48697b822bb] temp-cycles-tbb: Build: upgrade from C++11 to C++14, matching VFX reference platform
Brecht Van Lommel
noreply at git.blender.org
Sat Jun 6 21:05:04 CEST 2020
Commit: 48697b822bbf56a6d05abc52ba90d246502c2e59
Author: Brecht Van Lommel
Date: Mon Apr 27 16:41:32 2020 +0200
Branches: temp-cycles-tbb
https://developer.blender.org/rB48697b822bbf56a6d05abc52ba90d246502c2e59
Build: upgrade from C++11 to C++14, matching VFX reference platform
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4037dc1e3e..9c7482901d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1563,19 +1563,18 @@ endif()
if(MSVC)
# MSVC needs to be tested first, since clang on windows will
- # match the compiler test below but clang-cl does not accept -std=c++11
+ # match the compiler test below but clang-cl does not accept -std=c++14
# since it is on by default and cannot be turned off.
#
- # Nothing special is needed, C++11 features are available by default.
+ # Nothing special is needed, C++14 features are available by default.
elseif(
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")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
else()
- message(FATAL_ERROR "Unknown compiler ${CMAKE_C_COMPILER_ID}, can't enable C++11 build")
+ message(FATAL_ERROR "Unknown compiler ${CMAKE_C_COMPILER_ID}, can't enable C++14 build")
endif()
# Visual Studio has all standards it supports available by default
More information about the Bf-blender-cvs
mailing list