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 f667d047f51d3118809a821a29504cb9cf689a9e..c2de2f8a0db0031bb5c814b40890095fc8e1dbb1 100644 (file)
--- 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 51e236ed8b855eda7a29a0d05b4d8d15a279dbe4..01d5dc1d7a49aa7dd316c318dcdcd47f8b8ef281 100644 (file)
--- 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()