TR1: use std::tr1 regex with msvc10

[lyx.git] / development / cmake / config.h.cmake

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index d0cf2a886d4242ff820256cf31da7ad634c65128..b9852b647a0267b0eac88b05afd56ccfd39d79ac 100644 (file)
--- 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.
  */
@@ -18,23 +18,68 @@
 #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}
 
+#endif
+
+
+// cleanup 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
+
+