From dceb7e393d1d39a9a986b2baf15e2352d3b10b61 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Wed, 24 Jan 2018 01:18:32 +0100 Subject: [PATCH] build5*.bat: update to Qt 5.9.4 - also adjust build5-2015-x64.bat --- development/cmake/build5-2015-installer.bat | 2 +- development/cmake/build5-2015-x64.bat | 13 ++++++------- development/cmake/build5-2015.bat | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/development/cmake/build5-2015-installer.bat b/development/cmake/build5-2015-installer.bat index c0c4566537..80bc4a7978 100644 --- a/development/cmake/build5-2015-installer.bat +++ b/development/cmake/build5-2015-installer.bat @@ -5,7 +5,7 @@ REM Create a link and add cmd.exe /k in the preferences in front of the mingw. ::echo off REM Install Qt from qt.io -set PATH=C:\Qt\Qt5.9.3\5.9.3\msvc2015\bin;%PATH% +set PATH=C:\Qt\Qt5.9.4\5.9.4\msvc2015\bin;%PATH% set LYX_SOURCE=%~DP0..\.. set LYX_BUILD=%LYX_SOURCE%\..\build-result-5-2015 diff --git a/development/cmake/build5-2015-x64.bat b/development/cmake/build5-2015-x64.bat index 9ca66c9f0b..3c57915812 100644 --- a/development/cmake/build5-2015-x64.bat +++ b/development/cmake/build5-2015-x64.bat @@ -32,13 +32,12 @@ set CL=/MP REM Save path set CALLED_FROM=%CD% -REM Add path to qmake here or set PATH correctly on your system. -set PATH=C:\Qt\Qt5.9.3\5.9.3\msvc2015_64;%PATH% - REM Edit pathes here or set the environment variables on your system. -set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2015-x64 -set LYX_SOURCE=D:\LyXGit\Master\ -set LYX_BUILD=D:\LyXGit\Master\compile-2015-x64 +set CMAKE_PATH="C:\Program Files\CMake\bin" +set QT_PATH="C:\Qt\Qt5.9.4\5.9.4\msvc2015_64" +set GNUWIN32_DIR="D:\LyXGit\Master\lyx-windows-deps-msvc2015-x64" +set LYX_SOURCE="D:\LyXGit\Master" +set LYX_BUILD="D:\LyXGit\Master\compile-2015-x64" if [%LYX_SOURCE%]==[] ( set LYX_SOURCE=%~DP0\..\.. @@ -73,7 +72,7 @@ REM start with a new cmake run if "%1%" == "devel" ( REM Build solution to develop LyX REM you can add the option "-GNinja" for a faster compilation - cmake %LYX_SOURCE% -G"Visual Studio 14 2015 Win64" -DLYX_USE_QT=QT5 -DLYX_ENABLE_EXPORT_TESTS=0 -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=0 -DLYX_RELEASE=0 -DLYX_CONSOLE=ON -DLYX_3RDPARTY_BUILD=1 %DEPENDENCIES_DOWNLOAD% + cmake %LYX_SOURCE% -G"Visual Studio 14 2015 Win64" -DLYX_USE_QT=QT5 -DLYX_ENABLE_EXPORT_TESTS=0 -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=0 -DLYX_RELEASE=0 -DLYX_CONSOLE=FORCE -DLYX_3RDPARTY_BUILD=1 %DEPENDENCIES_DOWNLOAD% msbuild src\LyX.vcxproj /p:Configuration=Debug msbuild src\tex2lyx\tex2lyx.vcxproj /p:Configuration=Debug ) diff --git a/development/cmake/build5-2015.bat b/development/cmake/build5-2015.bat index 413ec5388c..6e11ce7ce1 100644 --- a/development/cmake/build5-2015.bat +++ b/development/cmake/build5-2015.bat @@ -34,7 +34,7 @@ set CALLED_FROM=%CD% REM Edit pathes here or set the environment variables on your system. set CMAKE_PATH="C:\Program Files\CMake\bin" -set QT_PATH="C:\Qt\Qt5.9.3\5.9.3\msvc2015" +set QT_PATH="C:\Qt\Qt5.9.4\5.9.4\msvc2015" set GNUWIN32_DIR="D:\LyXGit\Master\lyx-windows-deps-msvc2015" set LYX_SOURCE="D:\LyXGit\Master" set LYX_BUILD="D:\LyXGit\Master\compile-2015" -- 2.39.2