d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-12-04 08:08:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use vs2019 for CI

Browse source
This commit is contained in:
Nicolas Werner 2020-12-25 04:11:24 +01:00
parent 01e38d12ed
commit be9df45af9
3 changed files with 74 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -18,8 +18,8 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON CACHE BOOL "compile as PIC by default")
option(HUNTER_ENABLED "Enable Hunter package manager" OFF) option(HUNTER_ENABLED "Enable Hunter package manager" OFF)
include("cmake/HunterGate.cmake") include("cmake/HunterGate.cmake")
HunterGate( HunterGate(
URL "https://github.com/cpp-pm/hunter/archive/v0.23.260.tar.gz" URL "https://github.com/cpp-pm/hunter/archive/v0.23.288.tar.gz"
SHA1 "13775235910a3fa85644568d1c5be8271de72e1c" SHA1 "6c9b2bc606d86ae31f96a62fc68f0a593024815b"
) )
option(USE_BUNDLED_BOOST "Use the bundled version of Boost." ${HUNTER_ENABLED}) option(USE_BUNDLED_BOOST "Use the bundled version of Boost." ${HUNTER_ENABLED})

112
CMakeSettings.json
View file

@ -1,46 +1,66 @@
{ {
"configurations": [ "configurations": [
{ {
"name": "Debug", "name": "Debug",
"generator": "Visual Studio 15 2017 Win64", "generator": "Visual Studio 16 2019 Win64",
"configurationType": "Debug", "configurationType": "Debug",
"buildRoot": "${workspaceRoot}\\build-vc\\${name}", "buildRoot": "${workspaceRoot}\\build-vc\\${name}",
"cmakeCommandArgs": "", "cmakeCommandArgs": "",
"variables": [ "variables": [
{ {
"name": "CMAKE_TOOLCHAIN_FILE", "name": "HUNTER_ENABLED",
"value": "${workspaceRoot}\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake" // <-- change vcpkg location here "value": "OFF",
}, "type": "BOOL"
{ },
"name": "CMAKE_INSTALL_PREFIX", {
"value": "${workspaceRoot}/.deps" "name": "BUILD_SHARED_LIBS",
}, "value": "ON",
{ "type": "BOOL"
"name": "Qt5_DIR", },
"value": "C:\\Qt\\5.11.1\\msvc2017_64\\lib\\cmake\\Qt5" // <-- change qt location here {
} "name": "CMAKE_INSTALL_PREFIX",
] "value": "${workspaceRoot}/.deps",
}, "type": "STRING"
{ },
"name": "Release", {
"generator": "Visual Studio 15 2017 Win64", "name": "Qt5_DIR",
"configurationType": "Release", "value": "C:\\Qt\\5.12.5\\msvc2017_64\\lib\\cmake\\Qt5", // <-- change qt location here
"buildRoot": "${workspaceRoot}\\build-vc\\${name}", "type": "STRING"
"cmakeCommandArgs": "", }
"variables": [ ],
{ "cmakeToolchain": "${workspaceRoot}\\toolchain.cmake",
"name": "CMAKE_TOOLCHAIN_FILE", "inheritEnvironments": [ "msvc_x64" ]
"value": "${workspaceRoot}\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake" // <-- change vcpkg location here },
}, {
{ "name": "Release",
"name": "CMAKE_INSTALL_PREFIX", "generator": "Visual Studio 16 2019 Win64",
"value": "${workspaceRoot}/.deps" "configurationType": "Release",
}, "buildRoot": "${workspaceRoot}\\build-vc\\${name}",
{ "cmakeCommandArgs": "",
"name": "Qt5_DIR", "variables": [
"value": "C:\\Qt\\5.11.1\\msvc2017_64\\lib\\cmake\\Qt5" // <-- change qt location here {
} "name": "HUNTER_ENABLED",
] "value": "ON",
}, "type": "BOOL"
] },
} {
"name": "BUILD_SHARED_LIBS",
"value": "OFF",
"type": "BOOL"
},
{
"name": "CMAKE_INSTALL_PREFIX",
"value": "${workspaceRoot}/.deps",
"type": "STRING"
},
{
"name": "Qt5_DIR",
"value": "C:\\Qt\\5.12.5\\msvc2017_64\\lib\\cmake\\Qt5", // <-- change qt location here
"type": "STRING"
}
],
"cmakeToolchain": "${workspaceRoot}\\toolchain.cmake",
"inheritEnvironments": [ "msvc_x64" ]
}
]
}

12
appveyor.yml
View file

@ -3,7 +3,7 @@
version: 0.7.2-{build} version: 0.7.2-{build}
configuration: Release configuration: Release
image: Visual Studio 2017 image: Visual Studio 2019
platform: x64 platform: x64
environment: environment:
@ -22,9 +22,9 @@ build:
verbosity: minimal verbosity: minimal
install: install:
- set QT_DIR=C:\Qt\5.13\msvc2017_64 - set QT_DIR=C:\Qt\5.15\msvc2019_64
- set PATH=%PATH%;%QT_DIR%\bin - set PATH=C:\Strawberry\perl\bin;%PATH%;%QT_DIR%\bin
- call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
build_script: build_script:
# VERSION format: branch-master/branch-1.2 # VERSION format: branch-master/branch-1.2
@ -46,8 +46,8 @@ build_script:
- echo %DATE% - echo %DATE%
# Build nheko # Build nheko
#- cmake -G "Visual Studio 16 2019" -A x64 -H. -Bbuild #- cmake -G "Visual Studio 15 2017 Win64" -H. -Bbuild
- cmake -G "Visual Studio 15 2017 Win64" -H. -Bbuild - cmake -G "Visual Studio 16 2019" -A x64 -H. -Bbuild
-DHUNTER_ROOT="C:\hunter" -DHUNTER_ROOT="C:\hunter"
-DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF
-DCMAKE_BUILD_TYPE=Release -DHUNTER_CONFIGURATION_TYPES=Release -DCMAKE_BUILD_TYPE=Release -DHUNTER_CONFIGURATION_TYPES=Release