From 96ad38533191a128424a4bbeb5c8d7ddd61a7fc3 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Sat, 25 Jan 2020 00:30:01 +0100
Subject: [PATCH] Fix misc ci errors
---
.ci/script.sh | 6 ++++--
CMakeLists.txt | 2 +-
appveyor.yml | 1 -
src/ui/SnackBar.cpp | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.ci/script.sh b/.ci/script.sh
index bfac7cefa..0c6e3746a 100755
--- a/.ci/script.sh
+++ b/.ci/script.sh
@@ -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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5fe21dcb..8f939cded 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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()
diff --git a/appveyor.yml b/appveyor.yml
index dc6090d8f..3477a3d1f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -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
diff --git a/src/ui/SnackBar.cpp b/src/ui/SnackBar.cpp
index 8a05d9375..5daa697ed 100644
--- a/src/ui/SnackBar.cpp
+++ b/src/ui/SnackBar.cpp
@@ -1,6 +1,6 @@
#include <QPainter>
-#include <tweeny/tweeny.h>
+#include <tweeny.h>
#include "SnackBar.h"
--
GitLab