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

More CI Fixes

Browse source
This commit is contained in:
Joe 2019-02-24 18:23:08 -05:00
parent d57a9dee81
commit e7b4c9ecb2
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.ci/script.sh
View file

@ -13,6 +13,10 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then
sudo update-alternatives --set g++ "/usr/bin/${CXX_COMPILER}" sudo update-alternatives --set g++ "/usr/bin/${CXX_COMPILER}"
fi fi
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
source /opt/qt${QT_PKG}/bin/qt${QT_PKG}-env.sh || true;
fi
if [ "$TRAVIS_OS_NAME" == "osx" ]; then if [ "$TRAVIS_OS_NAME" == "osx" ]; then
export CMAKE_PREFIX_PATH=/usr/local/opt/qt5 export CMAKE_PREFIX_PATH=/usr/local/opt/qt5
fi fi

8
deps/CMakeLists.txt vendored
View file

@ -73,10 +73,10 @@ set(SPDLOG_URL https://github.com/gabime/spdlog/archive/v1.1.0.tar.gz)
set(SPDLOG_HASH set(SPDLOG_HASH
3dbcbfd8c07e25f5e0d662b194d3a7772ef214358c49ada23c044c4747ce8b19) 3dbcbfd8c07e25f5e0d662b194d3a7772ef214358c49ada23c044c4747ce8b19)
set(JSON_HEADER_URL set(JSON_URL
https://github.com/nlohmann/json/releases/download/v3.2.0/json.hpp) https://github.com/nlohmann/json.git)
set(JSON_HEADER_HASH set(JSON_TAG
ce6b5610a051ec6795fa11c33854abebb086f0fd67c311f5921c3c07f9531b44) v3.2.0)
if(USE_BUNDLED_JSON) if(USE_BUNDLED_JSON)
include(Json) include(Json)