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

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index f491f1aec2..8fec6a397f 100644
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * This is the compilation configuration file for LyX.
- * It was generated by autoconfs configure.
+ * It was generated by cmake.
  * You might want to change some of the defaults if something goes wrong
  * during the compilation.
  */
@@ -12,33 +12,114 @@
 #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}"
+#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}"
 
-#cmakedefine PROGRAM_SUFFIX "${PPROGRAM_SUFFIX}"
-#cmakedefine LYX_ABS_INSTALLED_DATADIR "${LYX_DIR}"
-#cmakedefine LYX_ABS_INSTALLED_LOCALEDIR "${LOCALEDIR}"
-#cmakedefine LYX_ABS_TOP_SRCDIR "${TOP_SRCDIR}"
+#define PROGRAM_SUFFIX "${PROGRAM_SUFFIX}"
+#define LYX_ABS_INSTALLED_DATADIR "${LYX_ABS_INSTALLED_DATADIR}"
+#define LYX_ABS_INSTALLED_LOCALEDIR "${LYX_ABS_INSTALLED_LOCALEDIR}"
+#define LYX_ABS_TOP_SRCDIR "${TOP_SRC_DIR}"
 
 #cmakedefine USE_POSIX_PACKAGING 1
 #cmakedefine USE_WINDOWS_PACKAGING 1
 #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
+
+
+#endif // config.h guard
+
+
 
+// Unguarded cleanup of global namespace:
+
+#ifdef ColorMode
+#undef ColorMode
+#endif
+
+#ifdef FocusOut
+#undef FocusOut
+#endif
+
+#ifdef FocusIn
+#undef FocusIn
+#endif
+
+#ifdef KeyRelease
+#undef KeyRelease
+#endif
+
+#ifdef CursorShape
+#undef CursorShape
+#endif
+
+#ifdef IGNORE
+#undef IGNORE
+#endif
+
+#ifdef GrayScale
+#undef GrayScale
+#endif
+
+#ifdef Status
+#undef Status
 #endif
+
+#ifdef IN
+#undef IN
+#endif
+
+#ifdef KeyPress
+#undef KeyPress
+#endif
+