From 8f5acc63c456190565ca5f6141a639276c09136d Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Tue, 7 Dec 2010 00:13:16 +0000 Subject: [PATCH] Replay r36746 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36755 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/CMakeLists.txt | 1 + development/cmake/modules/LyXMacros.cmake | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index a88b68d569..0e129f271f 100644 --- a/development/cmake/CMakeLists.txt +++ b/development/cmake/CMakeLists.txt @@ -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) diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake index 928a9d05a1..b1898fb40e 100644 --- a/development/cmake/modules/LyXMacros.cmake +++ b/development/cmake/modules/LyXMacros.cmake @@ -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()