[Bf-blender-cvs] [ebe37453cd5] temp-cxx-upgrade: Upgrade C++ standard to C++17

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


Commit: ebe37453cd5e88ae09524b92721cd3676349056e
Author: Sergey Sharybin
Date:   Thu Jun 18 11:01:52 2020 +0200
Branches: temp-cxx-upgrade
https://developer.blender.org/rBebe37453cd5e88ae09524b92721cd3676349056e

Upgrade C++ standard to C++17

Ref T76783

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d8c40fc34e..90133cb7338 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1561,13 +1561,13 @@ if(WITH_PYTHON)
 endif()
 
 if(MSVC)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++14")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17")
 elseif(
   CMAKE_COMPILER_IS_GNUCC OR
   CMAKE_C_COMPILER_ID MATCHES "Clang" OR
   CMAKE_C_COMPILER_ID MATCHES "Intel"
 )
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 else()
   message(FATAL_ERROR "Unknown compiler ${CMAKE_C_COMPILER_ID}, can't enable C++14 build")
 endif()



More information about the Bf-blender-cvs mailing list