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 e5db2e7303e982c564a54e9dd4ea7720bbafc54d..26aa35faaa24adb692032a958e8a238a2c674971 100644 (file)
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -13,9 +13,9 @@
 #define _CONFIG_H
 
 // obligatory flags
-#define QT_NO_STL
-#define QT_NO_KEYWORDS
-#define HAVE_ICONV
+#define QT_NO_STL 1
+#define QT_NO_KEYWORDS 1
+#define HAVE_ICONV 1
 
 #include "configCompiler.h"
 
@@ -24,11 +24,16 @@
 #endif
 
 
+#cmakedefine LYX_DEVEL_VERSION 1
+#if defined(LYX_DEVEL_VERSION)
+       #define DEVEL_VERSION 1
+#else
+       #undef DEVEL_VERSION
+#endif
 #cmakedefine PACKAGE "${PACKAGE}"
 #cmakedefine PACKAGE_VERSION "${PACKAGE_VERSION}"
 #define PACKAGE_STRING "LyX ${PACKAGE_VERSION}"
 #cmakedefine PACKAGE_BUGREPORT "${PACKAGE_BUGREPORT}"
-#cmakedefine LYX_DATE "${LYX_DATE}"
 #cmakedefine VERSION_INFO "${VERSION_INFO}"
 #cmakedefine LYX_DIR_VER "${LYX_DIR_VER}"
 #cmakedefine LYX_USERDIR_VER "${LYX_USERDIR_VER}"
@@ -49,13 +54,33 @@
 
 #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
+
+// Define if std::string uses copy-on-write
+#cmakedefine STD_STRING_USES_COW 1
 
-#cmakedefine ASPELL_FOUND 1
-#ifdef ASPELL_FOUND
-#define USE_ASPELL 1
+// 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
 #ifdef AIKSAURUSLIB_FOUND
@@ -63,19 +88,9 @@
 #define AIKSAURUS_H_LOCATION "${AIKSAURUSLIB_H}"
 #endif
 
-#cmakedefine ENCHANT_FOUND 1
-#ifdef ENCHANT_FOUND
-#define USE_ENCHANT 1
-#endif
-
-#cmakedefine HUNSPELL_FOUND 1
-#ifdef HUNSPELL_FOUND
-#define USE_HUNSPELL 1
-#endif
-
 #cmakedefine LYX_NLS 1
 #ifdef LYX_NLS
-#define ENABLE_NLS
+#define ENABLE_NLS 1
 #endif