From: Uwe Stöhr Date: Wed, 15 Feb 2012 23:17:34 +0000 (+0000) Subject: cmake/build.bat: disable merged build be default, can be re-enabled for a final build... X-Git-Tag: 2.1.0beta1~2046 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=220cbe0fd87f9e81ead6264ba0ad98d62cde9e34;p=features.git cmake/build.bat: disable merged build be default, can be re-enabled for a final build (as suggested by Peter) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40764 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/development/cmake/build.bat b/development/cmake/build.bat index 96ff879197..645af0b75a 100755 --- a/development/cmake/build.bat +++ b/development/cmake/build.bat @@ -36,9 +36,9 @@ REM Add path to qmake here or set PATH correctly on your system. set PATH="D:\Qt\bin";%PATH% REM Edit pathes here or set the environment variables on you system. -::set GNUWIN32_DIR=D:\LyXSVN\lyx-devel\lyx-windows-deps-msvc2010 -::set LYX_SOURCE=D:\LyXSVN\lyx-devel -::set LYX_BUILD=D:\LyXSVN\lyx-devel\compile-result +set GNUWIN32_DIR=D:\LyXSVN\lyx-devel\lyx-windows-deps-msvc2010 +set LYX_SOURCE=D:\LyXSVN\lyx-devel +set LYX_BUILD=D:\LyXSVN\lyx-devel\compile-result if [%LYX_SOURCE%]==[] ( set LYX_SOURCE=%~DP0\..\.. @@ -85,7 +85,8 @@ if "%1%" == "devel" ( if "%1%" == "install" ( REM Build solution to develop LyX - cmake %LYX_SOURCE% -G%USED_STUDIO% -DLYX_MERGE_FILES=1 -DLYX_INSTALL=1 %DEPENDENCIES_DOWNLOAD% + REM set -DLYX_MERGE_REBUILD and -DLYX_MERGE_FILES to 1 for a version released with an installer + cmake %LYX_SOURCE% -G%USED_STUDIO% -DLYX_MERGE_REBUILD=0 -DLYX_MERGE_FILES=0 -DLYX_INSTALL=1 %DEPENDENCIES_DOWNLOAD% msbuild lyx.sln /p:Configuration=Release /t:ALL_BUILD msbuild INSTALL.vcxproj /p:Configuration=Release )