X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2Fconfig.h.cmake;h=8fec6a397f59f3ca007589fed0e790acc43c41eb;hb=a874b384557b078b77713cbe5d2f3c8c72434eee;hp=b9852b647a0267b0eac88b05afd56ccfd39d79ac;hpb=38628558a6af8d8a13e55546e99365dda1dca9e5;p=lyx.git

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index b9852b647a..8fec6a397f 100644
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -12,16 +12,17 @@
 #ifndef _CONFIG_H
 #define _CONFIG_H
 
+// obligatory flags
+#define QT_NO_STL
+#define QT_NO_KEYWORDS
+#define HAVE_ICONV
+
 #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 PACKAGE "${PACKAGE}"
 #cmakedefine PACKAGE_VERSION "${PACKAGE_VERSION}"
@@ -42,10 +43,46 @@
 #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 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
 #endif
 
 
-// cleanup global namespace
+#endif // config.h guard
+
+
+
+// Unguarded cleanup of global namespace:
+
 #ifdef ColorMode
 #undef ColorMode
 #endif
@@ -82,4 +119,7 @@
 #undef IN
 #endif
 
+#ifdef KeyPress
+#undef KeyPress
+#endif