commit 11e12c787a6fe70908dfa4988b8df8ccdbc89d3a
Author: Uwe Stöhr <[email protected]>
Date: Tue Dec 8 01:40:48 2015 +0100
build5.bat: explicitly set QT5
diff --git a/development/cmake/build5.bat b/development/cmake/build5.bat
index 53699c4..2acfe7c 100644
--- a/development/cmake/build5.bat
+++ b/development/cmake/build5.bat
@@ -81,14 +81,14 @@ if [%2]==[] (
if "%1%" == "devel" (
REM Build solution to develop LyX
- cmake %LYX_SOURCE% -GNinja -G%USED_STUDIO% -DLYX_ENABLE_CXX11=ON
-DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=0 -DLYX_RELEASE=0
-DLYX_CONSOLE=FORCE %DEPENDENCIES_DOWNLOAD%
+ cmake %LYX_SOURCE% -GNinja -G%USED_STUDIO% -DLYX_ENABLE_CXX11=ON
-DLYX_USE_QT=QT5 -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=0
-DLYX_RELEASE=0 -DLYX_CONSOLE=FORCE %DEPENDENCIES_DOWNLOAD%
msbuild lyx.sln /p:Configuration=Debug /t:ALL_BUILD
)
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% -G%USED_STUDIO% -DLYX_ENABLE_CXX11=ON
-DLYX_MERGE_REBUILD=1 -DLYX_MERGE_FILES=1 -DLYX_NLS=1 -DLYX_INSTALL=1
-DLYX_RELEASE=1 -DLYX_CONSOLE=OFF %DEPENDENCIES_DOWNLOAD%
+ cmake %LYX_SOURCE% -G%USED_STUDIO% -DLYX_ENABLE_CXX11=ON
-DLYX_USE_QT=QT5 -DLYX_MERGE_REBUILD=1 -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
)