diff --git a/.ci/script.sh b/.ci/script.sh index bfac7cefa5cbb1fbda7e9d470ffc9579a839ca69..0c6e3746a214dc1c388dfb6e533446a48fc6147b 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 d5fe21dcb383e9a30440be97110105b9b9c32a02..8f939cded36504aab5219e8bce6020f831275a61 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 dc6090d8fd7db8be3af12d9111ffe6c6548fa6dc..3477a3d1fc6050c4320c8671b7bed15df6654456 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 8a05d9375dabe95e026f3ff53055d8acaef19110..5daa697ed3dc1f3f24a2aeeda7fd3fc4eeaabcab 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"