mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-19 23:34:04 +02:00
Compare commits
7 commits
560bf30417
...
3ef14942d7
Author | SHA1 | Date | |
---|---|---|---|
3ef14942d7 | |||
4991e5b866 | |||
5ae7ef7803 | |||
9d16ffb016 | |||
fbf90fc109 | |||
e0692bdc76 | |||
718f8bf75a |
24
appveyor.yml
24
appveyor.yml
|
@ -49,7 +49,7 @@ environment:
|
|||
BUILD_SYSTEM: "qbs"
|
||||
ENABLE_PCH: false
|
||||
GCC_VERSION: 11.2
|
||||
MINGW_PATH: C:\Qt\Tools\mingw1120_64\bin
|
||||
MINGW_PATH: C:\Qt\Tools\mingw810_64\bin
|
||||
ARCH: x64
|
||||
PYTHON: "C:\\Python311-x64"
|
||||
PLATFORM: "Windows10+"
|
||||
|
@ -84,7 +84,7 @@ environment:
|
|||
- job_name: MacOS_12_Qt_6_4 (multibundle)
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
|
||||
COMPILER: clang
|
||||
QT: ${HOME}/Qt/6.4/macos
|
||||
QT: Qt/6.4/macos
|
||||
QT_VERSION: Qt6_4
|
||||
BUILD_SYSTEM: "qbs"
|
||||
ARCH: x64
|
||||
|
@ -98,7 +98,7 @@ environment:
|
|||
- job_name: MacOS_12_Qt_6_4 (singlebundle)
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
|
||||
COMPILER: clang
|
||||
QT: ${HOME}/Qt/6.4/macos
|
||||
QT: Qt/6.4/macos
|
||||
QT_VERSION: Qt6_4
|
||||
BUILD_SYSTEM: "qbs"
|
||||
ARCH: x64
|
||||
|
@ -112,7 +112,7 @@ environment:
|
|||
- job_name: MacOS_10_15_Qt_5_15 (qbs, multibundle)
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
|
||||
COMPILER: clang
|
||||
QT: ${HOME}/Qt/5.15/clang_64
|
||||
QT: Qt/5.15/clang_64
|
||||
QT_VERSION: Qt5_15
|
||||
BUILD_SYSTEM: "qbs"
|
||||
ARCH: x64
|
||||
|
@ -126,7 +126,7 @@ environment:
|
|||
- job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle)
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
|
||||
COMPILER: clang
|
||||
QT: ${HOME}/Qt/5.15/clang_64
|
||||
QT: Qt/5.15/clang_64
|
||||
QT_VERSION: Qt5_15
|
||||
BUILD_SYSTEM: "qbs"
|
||||
ARCH: x64
|
||||
|
@ -228,7 +228,7 @@ environment:
|
|||
- job_name: MacOS_10_15_Qt_5_15 (make)
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
|
||||
COMPILER: clang
|
||||
QT: ${HOME}/Qt/5.15/clang_64
|
||||
QT: Qt/5.15/clang_64
|
||||
QT_VERSION: Qt5_15
|
||||
BUILD_SYSTEM: "make"
|
||||
ARCH: x64
|
||||
|
@ -442,10 +442,10 @@ for:
|
|||
}
|
||||
} elseif ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2015") {
|
||||
if ($env:ARCH -eq "x64") {
|
||||
& "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd /x64"
|
||||
& "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86_amd64"
|
||||
'& "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64'
|
||||
'& "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64'
|
||||
} else {
|
||||
& "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86"
|
||||
'& "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -511,7 +511,7 @@ for:
|
|||
- rm '/usr/local/bin/cpack'
|
||||
- rm '/usr/local/bin/ctest'
|
||||
- brew install --force coreutils qbs cmake
|
||||
- export QTDIR="$QT"
|
||||
- export QTDIR="${HOME}/${QT}"
|
||||
- export PATH="$QTDIR/bin:$HOME/.local/bin:`python3 -m site --user-base`/bin:$PATH"
|
||||
- echo $PATH
|
||||
- python3 --version
|
||||
|
@ -543,7 +543,7 @@ for:
|
|||
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --command-echo-mode command-line config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false
|
||||
|
||||
deploy_script:
|
||||
- CIRRUS_WORKING_DIR=${APPVEYOR_BUILD_FOLDER CIRRUS_CHANGE_IN_REPO=${APPVEYOR_REPO_COMMIT} CIRRUS_BRANCH=${APPVEYOR_REPO_BRANCH} ${APPVEYOR_BUILD_FOLDER}/scripts/cirrus-deploy.sh
|
||||
- CIRRUS_WORKING_DIR=${APPVEYOR_BUILD_FOLDER} CIRRUS_CHANGE_IN_REPO=${APPVEYOR_REPO_COMMIT} CIRRUS_BRANCH=${APPVEYOR_REPO_BRANCH} ${APPVEYOR_BUILD_FOLDER}/scripts/cirrus-deploy.sh
|
||||
|
||||
-
|
||||
matrix:
|
||||
|
@ -551,7 +551,7 @@ for:
|
|||
- job_name: MacOS_10_15_Qt_5_15 (make)
|
||||
|
||||
init:
|
||||
- export QTDIR="$QT"
|
||||
- export QTDIR="${HOME}/${QT}"
|
||||
- export PATH="$QTDIR/bin:$PATH"
|
||||
- echo $PATH
|
||||
- find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
|
||||
|
|
|
@ -38,8 +38,8 @@ Library {
|
|||
prefix: product.sourceDirectory + "/"
|
||||
files: {
|
||||
var files = ["stable.h"];
|
||||
if (qbs.toolchain.contains("msvc"))
|
||||
files.push("stable.cpp")
|
||||
// if (qbs.toolchain.contains("msvc"))
|
||||
// files.push("stable.cpp")
|
||||
return files;
|
||||
}
|
||||
fileTags: ["cpp_pch_src"]
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
#include <list>
|
||||
#include <QtGlobal>
|
||||
#include "drw_base.h"
|
||||
#include <algorithm>
|
||||
|
||||
class dxfReader;
|
||||
class DRW_Polyline;
|
||||
|
|
Loading…
Reference in a new issue