commit c5236c42b9390f059763dbbb6faf8ffcca951634
Author: Uwe Stöhr <[email protected]>
Date: Tue Jan 26 01:57:15 2016 +0100
build5-2010.bat: use the same CMake parameters as in
build5-2010-installer.bat
diff --git a/development/cmake/build5-2010.bat
b/development/cmake/build5-2010.bat
index 3f18b87..ce6c101 100644
--- a/development/cmake/build5-2010.bat
+++ b/development/cmake/build5-2010.bat
@@ -82,14 +82,14 @@ if [%2]==[] (
if "%1%" == "devel" (
REM Build solution to develop LyX
REM you can add the option "-GNinja" for a faster compilation
- cmake %LYX_SOURCE% -GNinja -G%USED_STUDIO% -DLYX_ENABLE_CXX11=ON
-DLYX_USE_QT=QT5 -DLYX_ENABLE_EXPORT_TESTS=ON -DLYX_MERGE_FILES=0 -DLYX_NLS=1
-DLYX_INSTALL=0 -DLYX_RELEASE=0 -DLYX_CONSOLE=FORCE -LYX_3RDPARTY_BUILD=1
%DEPENDENCIES_DOWNLOAD%
+ cmake %LYX_SOURCE% -GNinja -G%USED_STUDIO% -DLYX_USE_QT=QT5
-DLYX_ENABLE_EXPORT_TESTS=ON -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=0
-DLYX_RELEASE=0 -DLYX_CONSOLE=FORCE -LYX_3RDPARTY_BUILD=1
%DEPENDENCIES_DOWNLOAD%
msbuild lyx.sln /p:Configuration=Debug /t:LyX /t:tex2lyx
)
if "%1%" == "install" (
REM Build solution to develop LyX
REM set -DLYX_MERGE_REBUILD and -DLYX_MERGE_FILES to 1 for a version
released with an installer
- cmake %LYX_SOURCE% -GNinja -G%USED_STUDIO% -DLYX_ENABLE_CXX11=ON
-DLYX_USE_QT=QT5 -DLYX_MERGE_REBUILD=0 -DLYX_MERGE_FILES=0 -DLYX_NLS=1
-DLYX_INSTALL=1 -DLYX_RELEASE=1 -DLYX_CONSOLE=OFF %DEPENDENCIES_DOWNLOAD%
+ cmake %LYX_SOURCE% -GNinja -G%USED_STUDIO% -DLYX_USE_QT=QT5
-DLYX_MERGE_FILES=1 -DLYX_NLS=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1
-DLYX_CONSOLE=OFF %DEPENDENCIES_DOWNLOAD%
msbuild lyx.sln /p:Configuration=Release /t:ALL_BUILD
msbuild INSTALL.vcxproj /p:Configuration=Release
)
