anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CMAKE: update path to Qt 5.6.1 and add missing build script

Browse Source
This commit is contained in:
Uwe Stöhr 2016-07-01 01:39:12 +02:00
parent bfeee826b4
commit b608174e9a
2 changed files with 92 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/cmake/build5-2015-x64.bat
View File

@ -33,7 +33,7 @@ REM Save path
set CALLED_FROM=%CD% set CALLED_FROM=%CD%
REM Add path to qmake here or set PATH correctly on your system. 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. REM Edit pathes here or set the environment variables on your system.
set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2015-x64 set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2015-x64

91
development/cmake/build5-2015.bat Normal file
View File

@ -0,0 +1,91 @@
echo off
echo -------------------------------------------------------------------------------------
echo -
echo Usage build.bat devel/install
echo devel - Builds Visual Studio project files for development on LyX
echo install - Builds Visual Studio project files with all enabled for installation
echo
echo -------------------------------------------------------------------------------------
echo -
echo Call this script from a build directory or set variables (or edit this file)
echo LYX_SOURCE
echo LXY_BUILD
echo
echo Be sure you've set qmake in PATH.
echo -
echo GNUWin32 will be downloaded if you don't set the variable GNUWIN32_DIR
echo -------------------------------------------------------------------------------------
echo -
echo -
if [%1]==[] (
echo ERROR: no options.
echo Exiting now.
goto :eof
)
REM Uncomment the following line if you want to compile in parallel.
REM This uses N cl.exe processes, where N is the number of cores.
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.6.1-MSVC2015\5.6\msvc2015\bin;%PATH%
REM Edit pathes here or set the environment variables on your system.
set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2015
set LYX_SOURCE=D:\LyXGit\Master\
set LYX_BUILD=D:\LyXGit\Master\compile-2015
if [%LYX_SOURCE%]==[] (
set LYX_SOURCE=%~DP0\..\..
)
echo LyX source: "%LYX_SOURCE%"
if [%LYX_BUILD%]==[] (
set LYX_BUILD=%CD%
)
echo LyX build : "%LYX_BUILD%"
if [%GNUWIN32_DIR%]==[] (
echo GNUWIN32_DIR not set.
echo Downloading win32 deps.
set DEPENDENCIES_DOWNLOAD="-DLYX_DEPENDENCIES_DOWNLOAD=1"
) else set PATH="%GNUWIN32_DIR%\bin";%PATH%
if not exist %LYX_BUILD% (
echo creating "%LYX_BUILD%"
mkdir "%LYX_BUILD%"
if not exist %LYX_BUILD% (
echo Exiting script.
goto :eof
)
)
cd "%LYX_BUILD%"
REM start with a new cmake run
::del CMakeCache.txt
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" -DLYX_ENABLE_CXX11=ON -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
)
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"Visual Studio 14 2015" -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%
msbuild INSTALL.vcxproj /p:Configuration=Release
)
REM go back to the dir where the script was called from
cd /D %CALLED_FROM%
:eof