X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2Fconfig.h.cmake;h=7bbe09eec17e8398547b9c0e5bd73c4c4308347b;hb=6de3c19fd63f810eed90ef3bc4469faf28e949c2;hp=3022bef10efd9768aa11c09e59f799b370c8ece8;hpb=3f379915a6a5dcc5a59bdddb2bdd825c5fea1d6d;p=lyx.git

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index 3022bef10e..7bbe09eec1 100644
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -12,24 +12,33 @@
 #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
 #include "pcheaders.h"
 #endif
 
-#cmakedefine WORDS_BIGENDIAN 1
-
-#cmakedefine HAVE_ASPELL_ASPELL_H 1
-#cmakedefine HAVE_ASPELL_H 1
 
+#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}"
@@ -41,10 +50,48 @@
 #cmakedefine USE_MACOSX_PACKAGING 1
 #cmakedefine PATH_MAX ${PATH_MAX}
 
+#cmakedefine WORDS_BIGENDIAN 1
+
+#cmakedefine LYX_MERGE_FILES 1
+
+#cmakedefine LYX_USE_TR1 1
+#cmakedefine LYX_USE_TR1_REGEX 1
+
+#cmakedefine Z_PREFIX 1
+
+#cmakedefine ASPELL_FOUND 1
+#ifdef ASPELL_FOUND
+#define USE_ASPELL 1
+#endif
+
+#cmakedefine AIKSAURUSLIB_FOUND 1
+#ifdef AIKSAURUSLIB_FOUND
+#define HAVE_LIBAIKSAURUS 1
+#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 1
+#endif
+
+
+#endif // config.h guard
+
+
+
+// Unguarded cleanup of global namespace:
 
-// cleanup global namespace
 #ifdef ColorMode
 #undef ColorMode
 #endif
@@ -77,3 +124,11 @@
 #undef Status
 #endif
 
+#ifdef IN
+#undef IN
+#endif
+
+#ifdef KeyPress
+#undef KeyPress
+#endif
+