diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | CMakeSettings.json | 112 | ||||
| -rw-r--r-- | appveyor.yml | 12 |
3 files changed, 74 insertions, 54 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index dbb3209a..230d1ee7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) include("cmake/HunterGate.cmake") HunterGate( - URL "https://github.com/cpp-pm/hunter/archive/v0.23.260.tar.gz" - SHA1 "13775235910a3fa85644568d1c5be8271de72e1c" + URL "https://github.com/cpp-pm/hunter/archive/v0.23.288.tar.gz" + SHA1 "6c9b2bc606d86ae31f96a62fc68f0a593024815b" ) option(USE_BUNDLED_BOOST "Use the bundled version of Boost." ${HUNTER_ENABLED}) diff --git a/CMakeSettings.json b/CMakeSettings.json index cd32e378..310be648 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -1,46 +1,66 @@ -{ - "configurations": [ - { - "name": "Debug", - "generator": "Visual Studio 15 2017 Win64", - "configurationType": "Debug", - "buildRoot": "${workspaceRoot}\\build-vc\\${name}", - "cmakeCommandArgs": "", - "variables": [ - { - "name": "CMAKE_TOOLCHAIN_FILE", - "value": "${workspaceRoot}\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake" // <-- change vcpkg location here - }, - { - "name": "CMAKE_INSTALL_PREFIX", - "value": "${workspaceRoot}/.deps" - }, - { - "name": "Qt5_DIR", - "value": "C:\\Qt\\5.11.1\\msvc2017_64\\lib\\cmake\\Qt5" // <-- change qt location here - } - ] - }, - { - "name": "Release", - "generator": "Visual Studio 15 2017 Win64", - "configurationType": "Release", - "buildRoot": "${workspaceRoot}\\build-vc\\${name}", - "cmakeCommandArgs": "", - "variables": [ - { - "name": "CMAKE_TOOLCHAIN_FILE", - "value": "${workspaceRoot}\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake" // <-- change vcpkg location here - }, - { - "name": "CMAKE_INSTALL_PREFIX", - "value": "${workspaceRoot}/.deps" - }, - { - "name": "Qt5_DIR", - "value": "C:\\Qt\\5.11.1\\msvc2017_64\\lib\\cmake\\Qt5" // <-- change qt location here - } - ] - }, - ] -} +{ + "configurations": [ + { + "name": "Debug", + "generator": "Visual Studio 16 2019 Win64", + "configurationType": "Debug", + "buildRoot": "${workspaceRoot}\\build-vc\\${name}", + "cmakeCommandArgs": "", + "variables": [ + { + "name": "HUNTER_ENABLED", + "value": "OFF", + "type": "BOOL" + }, + { + "name": "BUILD_SHARED_LIBS", + "value": "ON", + "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" ] + }, + { + "name": "Release", + "generator": "Visual Studio 16 2019 Win64", + "configurationType": "Release", + "buildRoot": "${workspaceRoot}\\build-vc\\${name}", + "cmakeCommandArgs": "", + "variables": [ + { + "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" ] + } + ] +} \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 16fea8d7..6f50bf4a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ version: 0.7.2-{build} configuration: Release -image: Visual Studio 2017 +image: Visual Studio 2019 platform: x64 environment: @@ -22,9 +22,9 @@ build: verbosity: minimal install: - - set QT_DIR=C:\Qt\5.13\msvc2017_64 - - set PATH=%PATH%;%QT_DIR%\bin - - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" + - set QT_DIR=C:\Qt\5.15\msvc2019_64 + - set PATH=C:\Strawberry\perl\bin;%PATH%;%QT_DIR%\bin + - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 build_script: # VERSION format: branch-master/branch-1.2 @@ -46,8 +46,8 @@ build_script: - echo %DATE% # 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_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DHUNTER_CONFIGURATION_TYPES=Release |