Cmake build: Adapt use of some variables

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

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index 95148b61e789742eb543a94d51f02f31964f0fb4..ad9292e7208e5798e31b4fadbc8cc99d62434f77 100644 (file)
--- 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}"
@@ -39,6 +33,8 @@
 #cmakedefine LYX_USERDIR_VER "${LYX_USERDIR_VER}"
 #define LYX_MAJOR_VERSION ${LYX_MAJOR_VERSION}
 #define LYX_MINOR_VERSION ${LYX_MINOR_VERSION}
+#define LYX_RELEASE_LEVEL ${LYX_RELEASE_VERSION}
+#define LYX_RELEASE_PATCH 0
 
 #define PROGRAM_SUFFIX "${PROGRAM_SUFFIX}"
 #define LYX_ABS_INSTALLED_DATADIR "${LYX_ABS_INSTALLED_DATADIR}"
@@ -91,9 +87,15 @@ ${Include_used_spellchecker}
 
 #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
 
+// Define to 1 if enchant is version 2.x at least
+#cmakedefine HAVE_ENCHANT2 1
+
+#endif // config.h guard
 
+#define MYTHES_H_LOCATION <${MYTHES_DIR}/mythes.hxx>
 
 // Unguarded cleanup of global namespace: