X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2Fconfig.h.cmake;h=0202a9e026efe5cba8259ab6fe0818aa7c36e62b;hb=b01a9dc187d9cd396a57463ad27511379dcdc9cd;hp=0f38b944c4b904924ab6f8cf2d70c13f671a7ba4;hpb=330db5cce1e21125298d3d618d10268d43116637;p=lyx.git

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index 0f38b944c4..0202a9e026 100644
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -33,6 +33,7 @@
 #cmakedefine HAVE_IOS 1
 #cmakedefine HAVE_LOCALE 1
 #cmakedefine HAVE_OPEN 1
+#cmakedefine HAVE_CHMOD 1
 #cmakedefine HAVE_CLOSE 1
 #cmakedefine HAVE_POPEN 1
 #cmakedefine HAVE_PCLOSE 1
@@ -63,7 +64,6 @@
 #cmakedefine HAVE_STRCASECMP 1
 #cmakedefine HAVE_STRDUP 1
 #cmakedefine HAVE_STRTOUL 1
-#cmakedefine HAVE_ALLOCA 1
 #cmakedefine HAVE___FSETLOCKING 1
 #cmakedefine HAVE_MEMPCPY 1
 #cmakedefine HAVE___ARGZ_COUNT 1
@@ -84,10 +84,32 @@
 #cmakedefine HAVE_LC_MESSAGES 1    
 #cmakedefine HAVE_SSTREAM 1
 #cmakedefine HAVE_ARGZ_H 1
+#cmakedefine SIZEOF_WCHAR_T_IS_2 1
+#cmakedefine SIZEOF_WCHAR_T_IS_4 1
+
+#ifdef SIZEOF_WCHAR_T_IS_2
+#  define SIZEOF_WCHAR_T 2
+#else
+#  ifdef SIZEOF_WCHAR_T_IS_4
+#    define SIZEOF_WCHAR_T 4
+#  endif
+#endif
+
+#cmakedefine HAVE_ALLOCA 1
+#cmakedefine HAVE_SYMBOL_ALLOCA 1
+#if defined(HAVE_SYMBOL_ALLOCA) && !defined(HAVE_ALLOCA)
+#define HAVE_ALLOCA
+#endif
 
 #cmakedefine HAVE_ASPELL_ASPELL_H 1
 #cmakedefine HAVE_ASPELL_H 1
 
+#cmakedefine HAVE_ICONV_CONST 1
+#ifdef HAVE_ICONV_CONST
+#define ICONV_CONST const
+#else
+#define ICONV_CONST
+#endif
 
 #cmakedefine PACKAGE "${PACKAGE}"
 #cmakedefine PACKAGE_VERSION ${PACKAGE_VERSION}
@@ -115,30 +137,50 @@
 #endif
 
 
+#ifdef _DEBUG
+#  define ENABLE_ASSERTIONS 1
+#endif
+
 #if !defined(ENABLE_ASSERTIONS)
 #  define BOOST_DISABLE_ASSERTS 1
 #endif
 #define BOOST_ENABLE_ASSERT_HANDLER 1
 
 #define BOOST_DISABLE_THREADS 1
-#define BOOST_NO_WREGEX 1
 #define BOOST_NO_WSTRING 1
 
 #ifdef __CYGWIN__
 #  define BOOST_POSIX 1
+#  define BOOST_POSIX_API 1
+#  define BOOST_POSIX_PATH 1
 #endif
 
 #if defined(HAVE_NEWAPIS_H)
 #  define WANT_GETFILEATTRIBUTESEX_WRAPPER 1
 #endif
 
+#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4
+#  define LIBC_WCTYPE_USES_UCS4
+#endif
+
 #if defined(MAKE_INTL_LIB) && defined(_MSC_VER)
 #define __attribute__(x)
 #define inline
 #define uintmax_t UINT_MAX
 #endif
 
+#ifdef _MSC_VER
+#ifdef HAVE_CHMOD
+#undef HAVE_CHMOD
+#endif
+#endif
 
+#ifdef HAVE_CHMOD
+#define HAVE_MODE_T
+#endif
 
+#ifdef LYX_ENABLE_PCH
+#include "pcheaders.h"
+#endif
 
-#endif
\ No newline at end of file
+#endif