X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2Fconfig.h.cmake;h=7fac0b00b574b1f569d4448b9f7f7d13ecf26efa;hb=0984e113171297e402c88ce048e9ccf1fb3d3619;hp=c2de2f8a0db0031bb5c814b40890095fc8e1dbb1;hpb=46d23449027eea9a270d79f83ee368fa8712db10;p=lyx.git

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index c2de2f8a0d..7fac0b00b5 100644
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -24,12 +24,6 @@
 #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}"
@@ -48,7 +42,7 @@
 #cmakedefine USE_POSIX_PACKAGING 1
 #cmakedefine USE_WINDOWS_PACKAGING 1
 #cmakedefine USE_MACOSX_PACKAGING 1
-#cmakedefine PATH_MAX ${PATH_MAX}
+#cmakedefine HAVE_DEF_PATH_MAX 1
 
 #cmakedefine WORDS_BIGENDIAN 1
 
@@ -68,15 +62,14 @@
 // use GNU libstdc++ with C++11 ABI
 #cmakedefine USE_GLIBCXX_CXX11_ABI 1
 
-// use GNU c++11 extensions
-#cmakedefine LYX_USE_CXX11 1
-#ifndef LYX_USE_CXX11
-  #if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
-    #error "Conflicting defines of LYX_USE_CXX11"
-  #endif
-#endif
 #cmakedefine Z_PREFIX 1
 
+// Defined if QT=QT5 uses X11
+#cmakedefine QPA_XCB 1
+
+// Define if you have the Qt5X11Extras module
+#cmakedefine HAVE_QT5_X11_EXTRAS 1
+
 ${Include_used_spellchecker}
 
 #cmakedefine AIKSAURUSLIB_FOUND 1
@@ -90,10 +83,14 @@ ${Include_used_spellchecker}
 #define ENABLE_NLS 1
 #endif
 
+#cmakedefine HAVE_DEF_MAKE_UNIQUE 1
 
-#endif // config.h guard
+// Define to 1 if std::call_once is supported by the compiler
+#cmakedefine LYX_USE_STD_CALL_ONCE 1
 
+#endif // config.h guard
 
+#define MYTHES_H_LOCATION <${MYTHES_DIR}/mythes.hxx>
 
 // Unguarded cleanup of global namespace: