Merge pull request #4550 from Mizux/master

CMake: Update CXX Standard management

Merge pull request #4550 from Mizux/master
CMake: Update CXX Standard management
7f2c3cec · Feng Xiao · GitHub · 1b219a17 · c3b152c7 · 7f2c3cec
Unverified Commit 7f2c3cec authored Apr 27, 2018 by Feng Xiao Committed by GitHub Apr 27, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

CMakeLists.txt cmake/CMakeLists.txt +5 -3

No files found.
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
 # Minimum CMake required
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.1.3)

 if(protobuf_VERBOSE)
  message(STATUS "Protocol Buffers Configuring...")
@@ -15,8 +15,10 @@ endif()
 # Project
 project(protobuf C CXX)

-# Add c++11 flags for clang
-set(CMAKE_CXX_FLAGS "-std=c++11")
+# Add c++11 flags
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)

 # Options
 option(protobuf_BUILD_TESTS "Build tests" ON)