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

Replay r36746

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36755 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2010-12-07 00:13:16 +00:00
parent 72f91cb394
commit 8f5acc63c4
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
development/cmake/CMakeLists.txt
View File

@ -69,6 +69,7 @@ LYX_OPTION(VLD "Use VLD with MSVC" OFF MSVC)
LYX_OPTION(WALL "Enable all warnings" OFF MSVC)
LYX_OPTION(DISABLE_PCH "Disable precompiled headers" ON ALL)
LYX_OPTION(MERGE_FILES "Merge source files into one compilation unit" OFF ALL)
LYX_OPTION(MERGE_REBUILD "Rebuild generated files from merged files build" OFF ALL)
LYX_OPTION(DEBUG_GLIBC "Enable libstdc++ debug mode" OFF GCC)
LYX_OPTION(DEBUG_GLIBC_PEDANTIC "Enable libstdc++pedantic debug mode" OFF GCC)
LYX_OPTION(STDLIB_DEBUG "Use debug stdlib" OFF GCC)

3
development/cmake/modules/LyXMacros.cmake
View File

@ -152,7 +152,8 @@ macro(lyx_const_touched_files _allinone_name _list)
endif()
endif()
if (merge_rebuild)
if (LYX_MERGE_REBUILD)
#message(STATUS "Merge files build: rebuilding generated files")
set(_rebuild_file_const 1)
set(_rebuild_file_touched 1)
endif()