Commit 2eb7ae20 authored by Victor Yacovlev's avatar Victor Yacovlev

Merge branch 'master' of git.niisi.ru:kumir/kumir2

parents 90971b3a 545eb451
Pipeline #335 failed with stages
in 14 minutes and 43 seconds
......@@ -8,7 +8,6 @@ configure:win32:
stage: configure
script:
- md build
- set QTDIR=%QTDIR%
- set QMAKESPEC=win32-msvc2015
- set INCLUDE=
- set LIB=
......@@ -16,14 +15,19 @@ configure:win32:
- call vsvars32.bat
- call vcvars32.bat
- cd build
- cmake -Wno-dev -DCMAKE_PREFIX_PATH=%QTDIR%\lib\cmake -DUSE_QT=5 -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=%PYTHON_EXECUTABLE% -G "NMake Makefiles" ..
- cmake -Wno-dev -DCMAKE_PREFIX_PATH="%QTDIR%\lib\cmake" -DQt5_DIR="%QTDIR%\lib\cmake\Qt5" -DUSE_QT=5 -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=%PYTHON_EXECUTABLE% -G "NMake Makefiles" ..
tags:
- windows
cache:
key: $CI_PIPELINE_ID
untracked: true
paths:
- build/
build:win32:
stage: build
script:
- set QTDIR=%QTDIR%
- cd build
- set QMAKESPEC=win32-msvc2016
- set INCLUDE=
- set LIB=
......@@ -33,10 +37,16 @@ build:win32:
- nmake
tags:
- windows
cache:
key: $CI_PIPELINE_ID
untracked: true
paths:
- build/
dist:win32:
stage: dist
script:
- cd build
- md kumir2-master-%CI_PIPELINE_ID%\
- md kumir2-master-%CI_PIPELINE_ID%\bin\
- copy /Y -R build\Release kumir2-master-%CI_PIPELINE_ID%
......@@ -79,10 +89,16 @@ dist:win32:
- copy /Y kumir2.nsi kumir2-master-%CI_PIPELINE_ID%\
tags:
- windows
cache:
key: $CI_PIPELINE_ID
untracked: true
paths:
- build/
pack:win32:
stage: pack
script:
- cd build
- cd kumir2-master-%CI_PIPELINE_ID%
- call %NSIS_EXECUTABLE% kumir2.nsi
- move /Y kumir2-master-%CI_PIPELINE_ID%-install.exe ..\
......
......@@ -2,6 +2,7 @@ project(Kumir2)
cmake_minimum_required(VERSION 3.0)
find_package(PythonInterp 3.2.0 REQUIRED)
set(USE_QT 5) # No more Qt4 support!!!
message(STATUS "Cmake prefix path: ${CMAKE_PREFIX_PATH}")
# Query for version info and pass it as compile definitions
if(EXISTS "${CMAKE_SOURCE_DIR}/version_info.cmake")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment