some more small changes to speed up the compilation time by merged files

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17498 a592a061-630c-0410-9148-cb99ea01b6c8

boost/libs/filesystem/src/operations.cpp

@@ -680,7 +680,7 @@ namespace boost
       {
         std::string narrow_short_form;
         std::wstring short_form;
-        for ( DWORD buf_sz( static_cast<DWORD>( ph.size()+1 ));; )
+        for ( DWORD buf_sz( static_cast<DWORD>( ph.size()+1 )); ; )
         {
           boost::scoped_array<wchar_t> buf( new wchar_t[buf_sz] );
           DWORD sz( ::GetShortPathNameW( ph.c_str(), buf.get(), buf_sz ) );
@@ -1040,7 +1040,7 @@ namespace boost
       BOOST_FILESYSTEM_DECL fs::system_error_type 
       get_current_path_api( std::string & ph )
       {
-        for ( long path_max = 32;; path_max *=2 ) // loop 'til buffer large enough
+        for ( long path_max = 32; ; path_max *=2 ) // loop 'til buffer large enough
         {
           boost::scoped_array<char>
             buf( new char[static_cast<std::size_t>(path_max)] );

development/cmake/CMakeLists.txt

@@ -38,7 +38,7 @@ if(merge OR MERGE_FILES)
 		set(MERGE_FILES TRUE CACHE TYPE STRING FORCE)
 	endif(NOT MERGE_FILES)
 	message(STATUS "")
-	message(STATUS "will merge all *.C files of a project into one file (exception: qt4 and boost files)")
+	message(STATUS "will merge all *.C files of a project into one file (exception: qt4 and boost_regex files )")
 	message(STATUS "")
 endif(merge OR MERGE_FILES)	
 

development/cmake/boost/CMakeLists.txt

@@ -5,3 +5,4 @@
 #
 
 add_subdirectory(libs) 
+

development/cmake/boost/libs/CMakeLists.txt

@@ -10,3 +10,4 @@ add_subdirectory(filesystem)
 add_subdirectory(iostreams) 
 add_subdirectory(regex) 
 add_subdirectory(signals) 
+

development/cmake/boost/libs/filesystem/CMakeLists.txt

@@ -15,4 +15,11 @@ set(boost_filesystem_sources
 
 lyx_add_path(boost_filesystem_sources ${TOP_SRC_DIR}/boost/libs/filesystem/src)
 
-add_library(boost_filesystem STATIC ${boost_filesystem_sources})
+if(NOT MERGE_FILES)
+	add_library(boost_filesystem STATIC ${boost_filesystem_sources})
+else(NOT MERGE_FILES)
+	add_definitions(-D_WIN32_WINNT=0x500)
+	lyx_merge_files(${CMAKE_CURRENT_BINARY_DIR}/boost_filesystem_allinone.C boost_filesystem_sources)
+	add_library(boost_filesystem STATIC ${CMAKE_CURRENT_BINARY_DIR}/boost_filesystem_allinone.C)
+endif(NOT MERGE_FILES)
+

development/cmake/boost/libs/iostreams/CMakeLists.txt

@@ -16,7 +16,12 @@ lyx_add_path(boost_iostreams_sources ${TOP_SRC_DIR}/boost/libs/iostreams/src)
 
 include_directories(${ZLIB_INCLUDE_DIR})
 
-add_library(boost_iostreams STATIC ${boost_iostreams_sources})
+if(NOT MERGE_FILES)
+	add_library(boost_iostreams STATIC ${boost_iostreams_sources})
+else(NOT MERGE_FILES)
+	lyx_merge_files(${CMAKE_CURRENT_BINARY_DIR}/boost_iostreams_allinone.C boost_iostreams_sources)
+	add_library(boost_iostreams STATIC ${CMAKE_CURRENT_BINARY_DIR}/boost_iostreams_allinone.C)
+endif(NOT MERGE_FILES)
 
 target_link_libraries(boost_iostreams ${ZLIB_LIBRARY})
 

development/cmake/boost/libs/regex/CMakeLists.txt

@@ -22,4 +22,3 @@ lyx_add_path(boost_regex_sources ${TOP_SRC_DIR}/boost/libs/regex/src)
 
 add_library(boost_regex STATIC ${boost_regex_sources})
 
-

development/cmake/boost/libs/signals/CMakeLists.txt

@@ -16,5 +16,10 @@ set(boost_signals_sources
 
 lyx_add_path(boost_signals_sources ${TOP_SRC_DIR}/boost/libs/signals/src)
 
-add_library(boost_signals STATIC ${boost_signals_sources})
+if(NOT MERGE_FILES)
-	
+	add_library(boost_signals STATIC ${boost_signals_sources})
+else(NOT MERGE_FILES)
+	lyx_merge_files(${CMAKE_CURRENT_BINARY_DIR}/boost_signals_allinone.C boost_signals_sources)
+	add_library(boost_signals STATIC ${CMAKE_CURRENT_BINARY_DIR}/boost_signals_allinone.C)
+endif(NOT MERGE_FILES)
+

development/cmake/src/CMakeLists.txt

@@ -74,4 +74,3 @@ endif(APPLE)
 
 project_source_group("${GROUP_CODE}" lyx_sources lyx_headers)
 
-