From f9eade32db9cc4551008b8c77177ab8e7a12adb8 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Tue, 29 Sep 2020 17:54:26 +0200 Subject: [PATCH] Use Ninja as generator. --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index ce0ca19..87c4bed 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,7 +18,7 @@ steps: CXX: clang++ commands: - conan remote add epsilon-public https://packages.p-epsilon.com/ - - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ . -B build-debug -DSTATICC=ON -DTESTS=ON + - cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ . -B build-debug -DSTATICC=ON -DTESTS=ON - cmake --build build-debug --target all -- -j 4 - build-debug/pkmnLibTests -s --durations yes --use-colour yes - name: test-release-linux @@ -31,7 +31,7 @@ steps: CXX: clang++ commands: - conan remote add epsilon-public https://packages.p-epsilon.com/ - - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ . -B build-release -DSTATICC=ON -DTESTS=ON + - cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ . -B build-release -DSTATICC=ON -DTESTS=ON - cmake --build build-release --target all -- -j 4 - build-release/pkmnLibTests -s --durations yes --use-colour yes - name: valgrind-release-linux @@ -67,7 +67,7 @@ steps: - update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix - update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix - update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix - - cmake -DCMAKE_BUILD_TYPE=Release . -B build-release-windows -D CMAKE_C_COMPILER=/usr/bin/x86_64-w64-mingw32-gcc -D CMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DWINDOWS=ON -DSTATICC=ON -DTESTS=ON + - cmake -GNinja -DCMAKE_BUILD_TYPE=Release . -B build-release-windows -D CMAKE_C_COMPILER=/usr/bin/x86_64-w64-mingw32-gcc -D CMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DWINDOWS=ON -DSTATICC=ON -DTESTS=ON - cmake --build build-release-windows --target all -- -j 4 - cp /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll /drone/src/build-release-windows/ - export WINEARCH=win64