Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/development/cmake/configCompiler.h.cmake b/development/cmake/configCompiler.h.cmake
index 54f48fe89ebe2672e45b6e1130f2174369537c7c..5af2eee2f790bd0727593024c154a06891ac6502 100644 (file)
--- a/development/cmake/configCompiler.h.cmake
+++ b/development/cmake/configCompiler.h.cmake
@@ -13,10 +13,8 @@
 #define _CONFIG_COMPILER_H
 
 
-#cmakedefine HAVE_IO_H 1
 #cmakedefine HAVE_LIMITS_H 1
 #cmakedefine HAVE_LOCALE_H 1
-#cmakedefine HAVE_PROCESS_H 1
 #cmakedefine HAVE_STDLIB_H 1
 #cmakedefine HAVE_SYS_STAT_H 1
 #cmakedefine HAVE_SYS_TIME_H 1
@@ -27,7 +25,6 @@
 #cmakedefine HAVE_INTTYPES_H 1
 #cmakedefine HAVE_UTIME_H 1
 #cmakedefine HAVE_STRING_H 1
-#cmakedefine HAVE_STRINGS_H 1
 #cmakedefine HAVE_ISTREAM 1
 #cmakedefine HAVE_OSTREAM 1
 #cmakedefine HAVE_IOS 1
@@ -48,8 +45,7 @@
 #cmakedefine HAVE_MKDIR 1
 #cmakedefine HAVE__MKDIR 1
 #cmakedefine HAVE_PUTENV 1
-#cmakedefine HAVE_MKTEMP 1
-#cmakedefine HAVE_MKSTEMP 1
+#cmakedefine HAVE_SETENV 1
 #cmakedefine HAVE_STRERROR 1
 #cmakedefine HAVE_STD_COUNT 1
 #cmakedefine HAVE_ASPRINTF 1
@@ -59,7 +55,6 @@
 #cmakedefine HAVE_FCNTL 1
 #cmakedefine HAVE_INTMAX_T 1
 #cmakedefine HAVE_INTTYPES_H_WITH_UINTMAX 1
-#cmakedefine HAVE_DECL_ISTREAMBUF_ITERATOR 1
 #cmakedefine CXX_GLOBAL_CSTD 1
 #cmakedefine HAVE_GETCWD 1
 #cmakedefine HAVE_STPCPY 1
@@ -87,6 +82,7 @@
 #cmakedefine HAVE_LC_MESSAGES 1    
 #cmakedefine HAVE_SSTREAM 1
 #cmakedefine HAVE_ARGZ_H 1
+#cmakedefine HAVE_MAGIC_H 1
 #cmakedefine SIZEOF_WCHAR_T_IS_2 1
 #cmakedefine SIZEOF_WCHAR_T_IS_4 1
 
@@ -140,7 +136,7 @@
 #endif
 #define BOOST_ENABLE_ASSERT_HANDLER 1
 
-#define BOOST_DISABLE_THREADS 1
+//#define BOOST_DISABLE_THREADS 1
 #define BOOST_NO_WSTRING 1
 
 #ifdef __CYGWIN__
@@ -149,10 +145,6 @@
 #  define BOOST_POSIX_PATH 1
 #endif
 
-#ifndef HAVE_NEWAPIS_H
-#  define WANT_GETFILEATTRIBUTESEX_WRAPPER 1
-#endif
-
 /*
  * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t
  * support compiled in:
@@ -183,6 +175,7 @@
 #define HAVE_MODE_T
 #endif
 
-
+#cmakedefine _GLIBCXX_DEBUG 1
+#cmakedefine _GLIBCXX_DEBUG_PEDANTIC 1
 
 #endif