[Bf-blender-cvs] [4e6a01efc63] temp-cxx-upgrade: Update C++ standard to C++14

Sergey Sharybin noreply at git.blender.org
Thu Jun 18 11:02:18 CEST 2020


Commit: 4e6a01efc635e82f94f72b37d7973d5c8971781d
Author: Sergey Sharybin
Date:   Thu Jun 18 10:45:40 2020 +0200
Branches: temp-cxx-upgrade
https://developer.blender.org/rB4e6a01efc635e82f94f72b37d7973d5c8971781d

Update C++ standard to C++14

This is an intermittent state to get all dependencies to compile.

For example, the latest Ceres is needed to bring C++17 support,
but it has bumped minimal requirement to C++14.

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b80db402ef..2c465d37e8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1561,20 +1561,15 @@ if(WITH_PYTHON)
 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
-  # since it is on by default and cannot be turned off.
-  #
-  # Nothing special is needed, C++11 features are available by default.
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++14")
 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