Do not use --std=c++14 for MSVC

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

diff --git a/development/cmake/configCompiler.h.cmake b/development/cmake/configCompiler.h.cmake
index 904671e9059a03dd52e87bdee1c96efb6007cba2..29ff1990e6ca92d15459acb820b2ac3a9284a656 100644 (file)
--- a/development/cmake/configCompiler.h.cmake
+++ b/development/cmake/configCompiler.h.cmake
@@ -13,24 +13,14 @@
 #define _CONFIG_COMPILER_H
 
 
-#cmakedefine HAVE_LIMITS_H 1
-#cmakedefine HAVE_LOCALE_H 1
-#cmakedefine HAVE_STDLIB_H 1
-#cmakedefine HAVE_SYS_STAT_H 1
-#cmakedefine HAVE_SYS_TIME_H 1
-#cmakedefine HAVE_SYS_TYPES_H 1
-#cmakedefine HAVE_SYS_UTIME_H 1
-#cmakedefine HAVE_SYS_SOCKET_H 1
-#cmakedefine HAVE_UNISTD_H 1
-#cmakedefine HAVE_INTTYPES_H 1
-#cmakedefine HAVE_UTIME_H 1
-#cmakedefine HAVE_STRING_H 1
 #cmakedefine HAVE_ISTREAM 1
 #cmakedefine HAVE_OSTREAM 1
 #cmakedefine HAVE_IOS 1
 #cmakedefine HAVE_LOCALE 1
 
-${Function_Defines}
+#include "configIncludes.h"
+
+#include "configFunctions.h"
 
 #cmakedefine HAVE_STD_COUNT 1
 #cmakedefine HAVE_ASPRINTF 1
@@ -52,6 +42,7 @@ ${Function_Defines}
 #cmakedefine HAVE_MAGIC_H 1
 #cmakedefine SIZEOF_WCHAR_T_IS_2 1
 #cmakedefine SIZEOF_WCHAR_T_IS_4 1
+#cmakedefine SIZEOF_LONG_LONG_GREATER_THAN_SIZEOF_LONG 1
 
 #ifdef SIZEOF_WCHAR_T_IS_2
 #  define SIZEOF_WCHAR_T 2
@@ -61,6 +52,12 @@ ${Function_Defines}
 #  endif
 #endif
 
+#ifdef HAVE_LONG_LONG
+#ifdef SIZEOF_LONG_LONG_GREATER_THAN_SIZEOF_LONG
+#define LYX_USE_LONG_LONG
+#endif
+#endif
+
 #cmakedefine GETTEXT_FOUND 1
 
 #cmakedefine HAVE_ALLOCA 1
@@ -88,12 +85,6 @@ ${Function_Defines}
 
 #define BOOST_ALL_NO_LIB 1
 
-#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
-#  define USE_BOOST_FORMAT 1
-#else
-#  define USE_BOOST_FORMAT 0
-#endif
-
 #ifdef _DEBUG
 #  define ENABLE_ASSERTIONS 1
 #endif
@@ -112,17 +103,7 @@ ${Function_Defines}
 #  define BOOST_POSIX_PATH 1
 #endif
 
-/*
- * 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__)
+#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4
 #  define USE_WCHAR_T
 #endif