mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-25 10:58:52 +00:00
CMake: add 2 build scripts to compile LyX with Qt 5 and MSVC 2015
This commit is contained in:
Uwe Stöhr
parent
234d482e1e
commit
978eea2173
@ -124,6 +124,8 @@ cmake/TODO.txt \
|
|||||||
cmake/build4-2010.bat \
|
cmake/build4-2010.bat \
|
||||||
cmake/build5-2010.bat \
|
cmake/build5-2010.bat \
|
||||||
cmake/build5-2010-installer.bat \
|
cmake/build5-2010-installer.bat \
|
||||||
|
cmake/build5-2015.bat \
|
||||||
|
cmake/build5-2015-installer.bat \
|
||||||
cmake/config.cpp.cmake \
|
cmake/config.cpp.cmake \
|
||||||
cmake/config.h.cmake \
|
cmake/config.h.cmake \
|
||||||
cmake/lyx_commit_hash.h.cmake \
|
cmake/lyx_commit_hash.h.cmake \
|
||||||
|
|||||||
41
development/cmake/build5-2015-installer.bat
Normal file
41
development/cmake/build5-2015-installer.bat
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
REM Run this script via double click.
|
||||||
|
|
||||||
|
REM Create a link and add cmd.exe /k in the preferences in front of the mingw.bat call to prevent closing the cmd window.
|
||||||
|
|
||||||
|
::echo off
|
||||||
|
|
||||||
|
REM Install Qt from qt.io
|
||||||
|
set PATH=C:\Qt\Qt5.6.0-MSVC2015\5.6\msvc2015\bin;%PATH%
|
||||||
|
|
||||||
|
set LYX_SOURCE=%~DP0..\..
|
||||||
|
set LYX_BUILD=%LYX_SOURCE%\..\build-result-5-2015
|
||||||
|
|
||||||
|
echo LyX source: %LYX_SOURCE%
|
||||||
|
echo LyX build : %LYX_BUILD%
|
||||||
|
|
||||||
|
|
||||||
|
REM first remove an existing compilation to assure a clean version
|
||||||
|
mkdir %LYX_BUILD%
|
||||||
|
del /s/q %LYX_BUILD%\*
|
||||||
|
rmdir /s/q %LYX_BUILD%\LYX_INSTALLED
|
||||||
|
|
||||||
|
REM Download http://sourceforge.net/projects/lyx/files/Win_installers/Dependencies/lyx20-deps-msvc2010-x86.zip
|
||||||
|
REM Extract on the same level as LyX sources
|
||||||
|
set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2010
|
||||||
|
|
||||||
|
REM MSVC 2015 tools
|
||||||
|
call "C:\Programme (x86)\MSVC2015\VC\vcvarsall.bat" x86
|
||||||
|
|
||||||
|
cd %LYX_BUILD%
|
||||||
|
cmake %LYX_SOURCE% -G"NMake Makefiles" -DLYX_USE_QT=QT5 -DLYX_MERGE_FILES=1 -DLYX_NLS=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1 -DLYX_CONSOLE=OFF
|
||||||
|
|
||||||
|
nmake doc
|
||||||
|
nmake translations
|
||||||
|
nmake
|
||||||
|
nmake install
|
||||||
|
|
||||||
|
goto :eof
|
||||||
|
:eof
|
||||||
|
|
||||||
|
REM go back to the dir where the script was called from
|
||||||
|
cd /D %CALLED_FROM%
|
||||||
95
development/cmake/build5-2015.bat
Normal file
95
development/cmake/build5-2015.bat
Normal file
@ -0,0 +1,95 @@
|
|||||||
|
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.0-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-msvc2010
|
||||||
|
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
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
REM MSVC 2015 tools
|
||||||
|
call "C:\Programme (x86)\MSVC2015\VC\vcvarsall.bat" x86
|
||||||
|
|
||||||
|
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%
|
||||||
|
REM msbuild lyx.sln /p:Configuration=Release /t:ALL_BUILD
|
||||||
|
msbuild INSTALL.vcxproj /p:Configuration=Release
|
||||||
|
)
|
||||||
|
|
||||||
|
REM go back to the dir where the script was called from
|
||||||
|
cd /D %CALLED_FROM%
|
||||||
|
|
||||||
|
:eof
|
||||||
Loading…
Reference in New Issue
Block a user