Back out "Revert D17908478: Switch PyTorch/Caffe2 to C++14"

Summary: Original commit changeset: 775d2e29be0b Reviewed By: mruberry Differential Revision: D18775520 fbshipit-source-id: a350b3f86b66d97241f208786ee67e9a51172eac
facebookresearch · Dec 3, 2019 · 0587682 · 0587682
1 parent 87fd951
commit 0587682
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,7 +19,7 @@ endif()
 
 # Add compiler flags.
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2 -fPIC -Wno-narrowing")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2 -fPIC -Wno-narrowing")
 
 # Print configuration summary.
 include(cmake/Summary.cmake)

diff --git a/cmake/legacy/Cuda.cmake b/cmake/legacy/Cuda.cmake
@@ -220,7 +220,7 @@ endforeach()
 # Set C++11 support
 set(CUDA_PROPAGATE_HOST_FLAGS OFF)
 if (NOT MSVC)
-  list(APPEND CUDA_NVCC_FLAGS "-std=c++11")
+  list(APPEND CUDA_NVCC_FLAGS "-std=c++14")
   list(APPEND CUDA_NVCC_FLAGS "-Xcompiler -fPIC")
 endif()
 

diff --git a/cmake/legacy/legacymake.cmake b/cmake/legacy/legacymake.cmake
@@ -21,7 +21,7 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/legacy/Modules)
 
 # Add compiler flags.
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2 -fPIC -Wno-narrowing")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2 -fPIC -Wno-narrowing")
 
 # Include Caffe2 CMake utils.
 include(cmake/legacy/Utils.cmake)