X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2FCMakeLists.txt;h=0e129f271f11797608b4243a98b723e06b775cdf;hb=56e0cfd582387e0e953c5d818fd68454bc133090;hp=18b3fcd2b3a465dcf4db84b02e201fb0a48d9639;hpb=4054d8624b5f628164630ed8b0c0df1912edb18f;p=lyx.git

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index 18b3fcd2b3..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)
@@ -498,7 +499,7 @@ if(ENCHANT_FOUND)
 endif()
 if(LYX_USE_EXTERNAL_BOOST)
 	if(Boost_FOUND)
-		set(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.38.0 (>= 1.38.0-6),libboost-signals1.38.0 (>= 1.38.0-6),${CPACK_DEBIAN_PACKAGE_DEPENDS}")
+		set(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.40.0 (>= 1.40.0-4),libboost-signals1.40.0 (>= 1.40.0-4),${CPACK_DEBIAN_PACKAGE_DEPENDS}")
 	endif()
 endif()
 #