From: Uwe Stöhr Date: Thu, 30 Jun 2016 23:39:38 +0000 (+0200) Subject: CMAKE: update path to Qt 5.6.1 X-Git-Tag: 2.3.0alpha1~1371 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f1818679ce2ebcdb03d0a2ca7b2d53255ca95b9d;p=features.git CMAKE: update path to Qt 5.6.1 --- diff --git a/development/cmake/build5-2015-installer.bat b/development/cmake/build5-2015-installer.bat index 27d6826e63..d670e2f76e 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.6.0-MSVC2015\5.6\msvc2015\bin;%PATH% +set PATH=C:\Qt\Qt5.6.1-MSVC2015\5.6\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 513fc0578d..759159e5cf 100644 --- a/development/cmake/build5-2015-x64.bat +++ b/development/cmake/build5-2015-x64.bat @@ -33,7 +33,7 @@ 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.6.0-MSVC2015-x64\5.6\msvc2015_64\bin;%PATH% +set PATH=C:\Qt\Qt5.6.1-MSVC2015-x64\5.6\msvc2015_64\bin;%PATH% REM Edit pathes here or set the environment variables on your system. set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2015-x64 diff --git a/development/cmake/build5-2015.bat b/development/cmake/build5-2015.bat index bda1f45c4d..0d69b1c021 100644 --- a/development/cmake/build5-2015.bat +++ b/development/cmake/build5-2015.bat @@ -33,7 +33,7 @@ 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.6.0-MSVC2015\5.6\msvc2015\bin;%PATH% +set PATH=C:\Qt\Qt5.6.1-MSVC2015\5.6\msvc2015\bin;%PATH% REM Edit pathes here or set the environment variables on you system. set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2015