Split TextMetrics::setRowHeight in three parts

[lyx.git] / development / cmake / config.h.cmake

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index ab95cfa4fb41b4236c70f459760d7df4458c2b29..26aa35faaa24adb692032a958e8a238a2c674971 100644 (file)
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -54,8 +54,7 @@
 
 #cmakedefine LYX_MERGE_FILES 1
 
-#cmakedefine LYX_USE_TR1 1
-#cmakedefine LYX_USE_TR1_REGEX 1
+#cmakedefine LYX_USE_STD_REGEX 1
 
 // Define if callstack can be printed
 #cmakedefine LYX_CALLSTACK_PRINTING 1
@@ -66,8 +65,21 @@
 // use libc++ provided by llvm instead of GNU libstdc++
 #cmakedefine USE_LLVM_LIBCPP 1
 
+// use GNU libstdc++ with C++11 ABI
+#cmakedefine USE_GLIBCXX_CXX11_ABI 1
+
+// 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
 
+// Defined if QT=QT5 uses X11
+#cmakedefine QPA_XCB 1
+
 ${Include_used_spellchecker}
 
 #cmakedefine AIKSAURUSLIB_FOUND 1