From: Kornel Benko <kornel@lyx.org>
Date: Thu, 3 Sep 2015 09:15:10 +0000 (+0200)
Subject: Cmake build: Adapt detection of C++11 mode to automake
X-Git-Tag: 2.2.0alpha1~364
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=46d23449027eea9a270d79f83ee368fa8712db10;p=features.git

Cmake build: Adapt detection of C++11 mode to automake
---

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index f667d047f5..c2de2f8a0d 100644
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -70,7 +70,11 @@
 
 // use GNU c++11 extensions
 #cmakedefine LYX_USE_CXX11 1
-
+#ifndef LYX_USE_CXX11
+  #if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
+    #error "Conflicting defines of LYX_USE_CXX11"
+  #endif
+#endif
 #cmakedefine Z_PREFIX 1
 
 ${Include_used_spellchecker}
diff --git a/development/cmake/modules/FindCXX11Compiler.cmake b/development/cmake/modules/FindCXX11Compiler.cmake
index 51e236ed8b..01d5dc1d7a 100644
--- a/development/cmake/modules/FindCXX11Compiler.cmake
+++ b/development/cmake/modules/FindCXX11Compiler.cmake
@@ -35,11 +35,11 @@ INCLUDE(CheckCXXSourceCompiles)
 INCLUDE(FindPackageHandleStandardArgs)
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "^[cC]lang$")
-  set(CXX11_FLAG_CANDIDATES "--std=c++11")
+  set(CXX11_FLAG_CANDIDATES "--std=c++11 -Wno-deprecated-register")
 else()
   set(CXX11_FLAG_CANDIDATES
-    "--std=gnu++11"
     "--std=c++11"
+    "--std=gnu++11"
     "--std=gnu++0x"
   )
 endif()