From a0162153677b110684ef63c292ce5decff99bb83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Wed, 21 Mar 2007 21:22:10 +0000 Subject: [PATCH] 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 | 4 ++-- development/cmake/CMakeLists.txt | 2 +- development/cmake/boost/CMakeLists.txt | 1 + development/cmake/boost/libs/CMakeLists.txt | 1 + development/cmake/boost/libs/filesystem/CMakeLists.txt | 9 ++++++++- development/cmake/boost/libs/iostreams/CMakeLists.txt | 7 ++++++- development/cmake/boost/libs/regex/CMakeLists.txt | 1 - development/cmake/boost/libs/signals/CMakeLists.txt | 9 +++++++-- development/cmake/src/CMakeLists.txt | 1 - 9 files changed, 26 insertions(+), 9 deletions(-) diff --git a/boost/libs/filesystem/src/operations.cpp b/boost/libs/filesystem/src/operations.cpp index e42e7a7f50..c51f5246fc 100644 --- a/boost/libs/filesystem/src/operations.cpp +++ b/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( ph.size()+1 ));; ) + for ( DWORD buf_sz( static_cast( ph.size()+1 )); ; ) { boost::scoped_array 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 buf( new char[static_cast(path_max)] ); diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index 2101dec281..e9bfb7964b 100644 --- a/development/cmake/CMakeLists.txt +++ b/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) diff --git a/development/cmake/boost/CMakeLists.txt b/development/cmake/boost/CMakeLists.txt index 433f6afff3..fed3b9a8c1 100644 --- a/development/cmake/boost/CMakeLists.txt +++ b/development/cmake/boost/CMakeLists.txt @@ -5,3 +5,4 @@ # add_subdirectory(libs) + diff --git a/development/cmake/boost/libs/CMakeLists.txt b/development/cmake/boost/libs/CMakeLists.txt index 3900c0cb8e..bc4e718831 100644 --- a/development/cmake/boost/libs/CMakeLists.txt +++ b/development/cmake/boost/libs/CMakeLists.txt @@ -10,3 +10,4 @@ add_subdirectory(filesystem) add_subdirectory(iostreams) add_subdirectory(regex) add_subdirectory(signals) + diff --git a/development/cmake/boost/libs/filesystem/CMakeLists.txt b/development/cmake/boost/libs/filesystem/CMakeLists.txt index 9261d6c6de..2217d5be16 100644 --- a/development/cmake/boost/libs/filesystem/CMakeLists.txt +++ b/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}) \ No newline at end of file +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) + diff --git a/development/cmake/boost/libs/iostreams/CMakeLists.txt b/development/cmake/boost/libs/iostreams/CMakeLists.txt index 8fd8209960..2d526d1faf 100644 --- a/development/cmake/boost/libs/iostreams/CMakeLists.txt +++ b/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}) diff --git a/development/cmake/boost/libs/regex/CMakeLists.txt b/development/cmake/boost/libs/regex/CMakeLists.txt index 78be4f7453..b7da4199d0 100644 --- a/development/cmake/boost/libs/regex/CMakeLists.txt +++ b/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}) - diff --git a/development/cmake/boost/libs/signals/CMakeLists.txt b/development/cmake/boost/libs/signals/CMakeLists.txt index a90be0dfe0..12340e1d3f 100644 --- a/development/cmake/boost/libs/signals/CMakeLists.txt +++ b/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) + diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt index 1edb6bcfb8..3a569bfdb9 100644 --- a/development/cmake/src/CMakeLists.txt +++ b/development/cmake/src/CMakeLists.txt @@ -74,4 +74,3 @@ endif(APPLE) project_source_group("${GROUP_CODE}" lyx_sources lyx_headers) -