From: Kefu Chai <kchai@redhat.com>
Date: Thu, 8 Dec 2016 01:48:24 +0000 (+0800)
Subject: cmake: should detect c++11 before enabling it
X-Git-Tag: v11.1.0~25^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dfa7de61b11b3913b53b1edbf017b92033dda992;p=ceph.git

cmake: should detect c++11 before enabling it

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 33f7ae954874..c90e2ed7952c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -123,14 +123,15 @@ endif(no_yasm)
 if(CMAKE_VERSION VERSION_LESS "3.1")
   include(CheckCXXCompilerFlag)
   CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
-  if(COMPILER_SUPPORTS_CXX11)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-  else()
-    message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support.")
+  if(NOT COMPILER_SUPPORTS_CXX11)
+    message(FATAL_ERROR
+      "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support.")
   endif()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 else()
   set(CMAKE_CXX_STANDARD 11)
   set(CMAKE_CXX_EXTENSIONS OFF)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
 endif()
 
 ## Handle diagnostics color if compiler supports them.