X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2Fconfig.h.cmake;h=ad9292e7208e5798e31b4fadbc8cc99d62434f77;hb=230cc9bc5b449d05be1a555a72bf2b7ab2906650;hp=a579dedc17397bf22580a93bda78073a68bb9164;hpb=24206e2c670632e5bf60d550395c77c6d7e60f0d;p=lyx.git

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index a579dedc17..ad9292e720 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}"
@@ -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}"
@@ -48,19 +44,35 @@
 #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
 
 #cmakedefine LYX_MERGE_FILES 1
 
-#cmakedefine LYX_USE_TR1 1
-#cmakedefine LYX_USE_TR1_REGEX 1
+#cmakedefine LYX_USE_STD_REGEX 1
 
-#cmakedefine ASPELL_FOUND 1
-#ifdef ASPELL_FOUND
-#define USE_ASPELL 1
-#endif
+// Define if callstack can be printed
+#cmakedefine LYX_CALLSTACK_PRINTING 1
+
+// Define if std::string uses copy-on-write
+#cmakedefine STD_STRING_USES_COW 1
+
+// use libc++ provided by llvm instead of GNU libstdc++
+#cmakedefine USE_LLVM_LIBCPP 1
+
+// use GNU libstdc++ with C++11 ABI
+#cmakedefine USE_GLIBCXX_CXX11_ABI 1
+
+#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
 #ifdef AIKSAURUSLIB_FOUND
@@ -68,60 +80,22 @@
 #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 1
-// These are needed when building included gettext (taken from autoconf macro)
-#cmakedefine LYX_EXTERNAL_LIBINTL 1
-#if !defined(LYX_EXTERNAL_LIBINTL)
-// this only makes sense when LYX_EXTERNAL_LIBINTL is OFF.
-#define __libc_lock_t                   gl_lock_t
-#define __libc_lock_define              gl_lock_define
-#define __libc_lock_define_initialized  gl_lock_define_initialized
-#define __libc_lock_init                gl_lock_init
-#define __libc_lock_lock                gl_lock_lock
-#define __libc_lock_unlock              gl_lock_unlock
-#define __libc_lock_recursive_t                   gl_recursive_lock_t
-#define __libc_lock_define_recursive              gl_recursive_lock_define
-#define __libc_lock_define_initialized_recursive  gl_recursive_lock_define_initialized
-#define __libc_lock_init_recursive                gl_recursive_lock_init
-#define __libc_lock_lock_recursive                gl_recursive_lock_lock
-#define __libc_lock_unlock_recursive              gl_recursive_lock_unlock
-#define glthread_in_use  libintl_thread_in_use
-#define glthread_lock_init     libintl_lock_init
-#define glthread_lock_lock     libintl_lock_lock
-#define glthread_lock_unlock   libintl_lock_unlock
-#define glthread_lock_destroy  libintl_lock_destroy
-#define glthread_rwlock_init     libintl_rwlock_init
-#define glthread_rwlock_rdlock   libintl_rwlock_rdlock
-#define glthread_rwlock_wrlock   libintl_rwlock_wrlock
-#define glthread_rwlock_unlock   libintl_rwlock_unlock
-#define glthread_rwlock_destroy  libintl_rwlock_destroy
-#define glthread_recursive_lock_init     libintl_recursive_lock_init
-#define glthread_recursive_lock_lock     libintl_recursive_lock_lock
-#define glthread_recursive_lock_unlock   libintl_recursive_lock_unlock
-#define glthread_recursive_lock_destroy  libintl_recursive_lock_destroy
-#define glthread_once                 libintl_once
-#define glthread_once_call            libintl_once_call
-#define glthread_once_singlethreaded  libintl_once_singlethreaded
-#define hash_string			libintl_hash_string
-#endif /* LYX_EXTERNAL_LIBINTL */
 #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
 
+// 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: