Replay r36746

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

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index a88b68d569a947adee221ed50b4881b9bb158816..0e129f271f11797608b4243a98b723e06b775cdf 100644 (file)
--- 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 928a9d05a103ab2ef05cadfd09dc837eb5720bd8..b1898fb40eeab1220a3175e442f531a9a720eeea 100644 (file)
--- 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()