anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17498 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2007-03-21 21:22:10 +00:00
parent 5b2d7ec76d
commit a016215367
9 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boost/libs/filesystem/src/operations.cpp
View File

@ -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)] );

2
development/cmake/CMakeLists.txt
View File

@ -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)

1
development/cmake/boost/CMakeLists.txt
View File

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

1
development/cmake/boost/libs/CMakeLists.txt
View File

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

9
development/cmake/boost/libs/filesystem/CMakeLists.txt
View File

@ -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)

7
development/cmake/boost/libs/iostreams/CMakeLists.txt
View File

@ -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})

1
development/cmake/boost/libs/regex/CMakeLists.txt
View File

@ -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})

7
development/cmake/boost/libs/signals/CMakeLists.txt
View File

@ -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)

1
development/cmake/src/CMakeLists.txt
View File

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