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

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

diff --git a/development/cmake/pcheaders.h b/development/cmake/pcheaders.h
index b4239847db706729cf4d12898b4f34b1433805d5..ba6cad796e0be47efd1c4c8be659ab8a8434d6ac 100644 (file)
--- a/development/cmake/pcheaders.h
+++ b/development/cmake/pcheaders.h
@@ -10,6 +10,7 @@
  */
 
 
+#ifdef LYX_PCH_BOOST
 #include <boost/any.hpp>
 #include <boost/array.hpp>
 #include <boost/assert.hpp>
@@ -17,11 +18,7 @@
 #include <boost/crc.hpp>
 #include <boost/cregex.hpp>
 #include <boost/current_function.hpp>
-#include <boost/filesystem/operations.hpp>
 #include <boost/function.hpp>
-#include <boost/iostreams/device/file.hpp>
-#include <boost/iostreams/filter/gzip.hpp>
-#include <boost/iostreams/filtering_streambuf.hpp>
 #include <boost/iterator/indirect_iterator.hpp>
 #include <boost/optional.hpp>
 #include <boost/regex.hpp>
@@ -34,14 +31,10 @@
 #include <boost/tuple/tuple.hpp>
 #include <boost/utility.hpp>
 #include <boost/version.hpp>
-
-#if BOOST_VERSION < 103300
-# include <boost/test/detail/nullstream.hpp>
-#else
-# include <boost/test/utils/nullstream.hpp>
 #endif
 
 
+#ifdef LYX_PCH_STL
 #include <algorithm>
 #include <cerrno>
 #include <cassert>
@@ -69,3 +62,10 @@
 #include <string>
 #include <utility>
 #include <vector>
+#endif
+
+
+#if defined(LYX_PCH_QT4) && defined(LYX_BUILD_QT4_FRONTEND)
+#include <QtCore>
+#include <QtGui>
+#endif