From 058262b4627dc3adf7d2d1a26d59005f43bc7883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
Date: Sat, 10 Jul 2010 19:17:43 +0000
Subject: [PATCH] cmake: sync with trunk

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34841 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/cmake/Install.cmake | 2 +-
 development/cmake/pcheaders.h   | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index 8be0392d5a..c34a2d70e7 100755
--- a/development/cmake/Install.cmake
+++ b/development/cmake/Install.cmake
@@ -2,7 +2,7 @@
 # TODO: set correct path in call to cmake
 # e.g. cmake /usr/src/lyx/lyx-devel/development/cmake -DCMAKE_INSTALL_PREFIX=/usr/local/share/lyx2.0 -Dnls=1
 
-message(STATUS "installing to ${CMAKE_INSTALL_PREFIX}, defined by CMAKE_INSTALL_PREFIX")
+message(STATUS "Installing to ${CMAKE_INSTALL_PREFIX}, defined by CMAKE_INSTALL_PREFIX")
 
 # the macro scans the directories "_parent_src_dir/_dir/_current_dir" for *._file_type files
 # and installs the files in CMAKE_INSTALL_PREFIX/_current_dir
diff --git a/development/cmake/pcheaders.h b/development/cmake/pcheaders.h
index 96538281db..ba6cad796e 100644
--- a/development/cmake/pcheaders.h
+++ b/development/cmake/pcheaders.h
@@ -31,11 +31,6 @@
 #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
 #endif