From 9bcc8464cc11d2c29c28065e78547d75ef38a2c9 Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Thu, 17 Dec 2020 23:22:22 +0100
Subject: [PATCH] ci: Ninja apt package installed and set as a default CMake
 generator

---
 .github/workflows/ci-test-package-cmake.yml |  8 ++++++--
 .github/workflows/documentation.yml         | 13 +++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml
index 1cea761b..b87d5652 100644
--- a/.github/workflows/ci-test-package-cmake.yml
+++ b/.github/workflows/ci-test-package-cmake.yml
@@ -37,6 +37,7 @@ on:
 env:
   CC: gcc-10
   CXX: g++-10
+  CMAKE_GENERATOR: Ninja
 
 jobs:
   setup:
@@ -55,6 +56,9 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
             ${{ runner.os }}-
+      - name: Install Ninja
+        run: |
+          sudo apt install -y ninja-build
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
@@ -83,7 +87,7 @@ jobs:
       - name: Configure CMake
         run: |
           cd build/${{ matrix.build_type }}
-          cmake ../../src -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=conan_paths.cmake
+          cmake ../../src -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=conan_paths.cmake
       - name: Install
         run: |
           cd build/${{ matrix.build_type }}
@@ -101,7 +105,7 @@ jobs:
       - name: Configure CMake
         run: |
           mkdir -p test_package/build/${{ matrix.build_type }} && cd test_package/build/${{ matrix.build_type }}
-          cmake ../.. -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_INSTALL_PREFIX=../../../build/${{ matrix.build_type }}/test_package -DCMAKE_TOOLCHAIN_FILE=../../../build/${{ matrix.build_type }}/conan_paths.cmake
+          cmake ../.. -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_INSTALL_PREFIX=../../../build/${{ matrix.build_type }}/test_package -DCMAKE_TOOLCHAIN_FILE=../../../build/${{ matrix.build_type }}/conan_paths.cmake
       - name: Build
         run: |
           cd test_package/build/${{ matrix.build_type }}
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 3054e2d3..dd2292fb 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -36,13 +36,15 @@ on:
     - 'src/**'
     - 'example/**'
 
+env:
+  CC: gcc-10
+  CXX: g++-10
+  CMAKE_GENERATOR: Ninja
+
 jobs:
   docs:
     name: Sphinx
     runs-on: ubuntu-20.04
-    env:
-      CC: gcc-10
-      CXX: g++-10
     steps:
       - uses: actions/checkout@v2
       - name: Cache Conan data
@@ -56,6 +58,9 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
             ${{ runner.os }}-
+      - name: Install Ninja
+        run: |
+          sudo apt install -y ninja-build
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
@@ -78,7 +83,7 @@ jobs:
       - name: Configure CMake
         run: |
           cd build
-          cmake .. -G Ninja
+          cmake ..
       - name: Generate documentation
         run: |
           cd build