minizip fixes for msvc and cmake

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

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index 0202a9e026efe5cba8259ab6fe0818aa7c36e62b..55da8fa75013cf8ba2833272a13dc883c4c0b0a0 100644 (file)
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -112,10 +112,14 @@
 #endif
 
 #cmakedefine PACKAGE "${PACKAGE}"
-#cmakedefine PACKAGE_VERSION ${PACKAGE_VERSION}
+#cmakedefine PACKAGE_VERSION "${PACKAGE_VERSION}"
+#cmakedefine LYX_DATE "${LYX_DATE}"
+#cmakedefine VERSION_INFO "${VERSION_INFO}"
+
 
 #cmakedefine USE_POSIX_PACKAGING 1
 #cmakedefine USE_WINDOWS_PACKAGING 1
+#cmakedefine USE_MACOSX_PACKAGING 1
 #cmakedefine PATH_MAX ${PATH_MAX}
 
 #ifdef _MSC_VER
@@ -159,8 +163,19 @@
 #  define WANT_GETFILEATTRIBUTESEX_WRAPPER 1
 #endif
 
-#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4
-#  define LIBC_WCTYPE_USES_UCS4
+
+/*
+ * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t
+ * support compiled in:
+ * http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#3_9
+ * And we are not interested at all what libc
+ * does: What we need is a 32bit wide wchar_t, and a libstdc++ that
+ * has the needed wchar_t support and uses UCS4. Whether it
+ * implements this with the help of libc, or whether it has own code
+ * does not matter for us, because we don't use libc directly (Georg)
+*/
+#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
+#  define USE_WCHAR_T
 #endif
 
 #if defined(MAKE_INTL_LIB) && defined(_MSC_VER)