mirror of
https://github.com/Nheko-Reborn/nheko.git
synced 2024-11-25 20:48:52 +03:00
Fix misc ci errors
This commit is contained in:
parent
c503c01474
commit
96ad385331
4 changed files with 6 additions and 5 deletions
|
@ -33,7 +33,8 @@ cmake -GNinja -H. -Bbuild \
|
|||
-DUSE_BUNDLED_OPENSSL=OFF \
|
||||
-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl \
|
||||
-DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include \
|
||||
-DCMAKE_PREFIX_PATH=/usr/local/opt/qt5
|
||||
-DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 \
|
||||
-DCI_BUILD=ON
|
||||
else
|
||||
cmake -GNinja -H. -Bbuild \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
|
@ -41,7 +42,8 @@ cmake -GNinja -H. -Bbuild \
|
|||
-DHUNTER_ROOT=".hunter" \
|
||||
-DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo -DHUNTER_CONFIGURATION_TYPES=RelWithDebInfo \
|
||||
-DUSE_BUNDLED_OPENSSL=OFF
|
||||
-DUSE_BUNDLED_OPENSSL=OFF \
|
||||
-DCI_BUILD=ON
|
||||
fi
|
||||
cmake --build build
|
||||
|
||||
|
|
|
@ -386,7 +386,7 @@ if(USE_BUNDLED_TWEENY)
|
|||
FetchContent_Declare(
|
||||
Tweeny
|
||||
GIT_REPOSITORY https://github.com/mobius3/tweeny.git
|
||||
GIT_TAG v3
|
||||
GIT_TAG 6a5033372fe53c4c731c66c8a2d56261746cd85c #v3 <- v3 has unfixed warnings
|
||||
)
|
||||
FetchContent_MakeAvailable(Tweeny)
|
||||
else()
|
||||
|
|
|
@ -22,7 +22,6 @@ install:
|
|||
- set PATH=%PATH%;%QT_DIR%\bin;C:\MinGW\bin
|
||||
- set PATH=%PATH%;C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev1\mingw64\bin
|
||||
- call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
|
||||
- cd "C:\Tools\vcpkg"&& git pull && .\bootstrap-vcpkg.bat && cd %APPVEYOR_BUILD_FOLDER%
|
||||
|
||||
build_script:
|
||||
# VERSION format: branch-master/branch-1.2
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include <QPainter>
|
||||
|
||||
#include <tweeny/tweeny.h>
|
||||
#include <tweeny.h>
|
||||
|
||||
#include "SnackBar.h"
|
||||
|
||||
|
|
Loading…
Reference in a new issue