X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2Fconfig.h.cmake;h=1c9456460e6830aa8f305edd00d2b76136d90db9;hb=2008e0876f055a1e67525300884530d52a52e7ae;hp=04feedf5795272692fd58b914dfc99b9fe99843e;hpb=23cfb00ef1fb5c73ba957e70c5e81b51b3dfef0e;p=lyx.git

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index 04feedf579..1c9456460e 100644
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -12,6 +12,11 @@
 #ifndef _CONFIG_H
 #define _CONFIG_H
 
+// obligatory flags
+#define QT_NO_STL 1
+#define QT_NO_KEYWORDS 1
+#define HAVE_ICONV 1
+
 #include "configCompiler.h"
 
 #ifdef LYX_ENABLE_PCH
@@ -19,14 +24,21 @@
 #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}"
+#define LYX_MAJOR_VERSION ${LYX_MAJOR_VERSION}
+#define LYX_MINOR_VERSION ${LYX_MINOR_VERSION}
 
 #define PROGRAM_SUFFIX "${PROGRAM_SUFFIX}"
 #define LYX_ABS_INSTALLED_DATADIR "${LYX_ABS_INSTALLED_DATADIR}"
@@ -42,13 +54,20 @@
 
 #cmakedefine LYX_MERGE_FILES 1
 
-#cmakedefine LYX_USE_TR1 1
-#cmakedefine LYX_USE_TR1_REGEX 1
+#cmakedefine LYX_USE_STD_REGEX 1
 
-#cmakedefine ASPELL_FOUND 1
-#ifdef ASPELL_FOUND
-#define USE_ASPELL 1
-#endif
+// 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
+
+// use libc++ provided by llvm instead of GNU libstdc++
+#cmakedefine USE_LLVM_LIBCPP 1
+
+#cmakedefine Z_PREFIX 1
+
+${Include_used_spellchecker}
 
 #cmakedefine AIKSAURUSLIB_FOUND 1
 #ifdef AIKSAURUSLIB_FOUND
@@ -56,19 +75,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