From e8d5edc9eb27247a36099a48fa935f7edf51e089 Mon Sep 17 00:00:00 2001
From: Michael Fabian 'Xaymar' Dirks <info@xaymar.com>
Date: Mon, 28 Sep 2020 21:28:21 +0200
Subject: [PATCH] ci: Fix support for new CMake script

---
 .github/workflows/main.yml     | 19 +++++++++++++------
 .github/workflows/validate.yml |  7 +++----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e3f297b8..e71cc0dd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -45,7 +45,10 @@ jobs:
     - name: "Configure Project"
       shell: bash
       run: |
-        cmake -H. -B"build/temp" -DCMAKE_INSTALL_PREFIX="build/distrib" -DCMAKE_PACKAGE_NAME="streamfx-${{ matrix.id }}" -DCMAKE_PACKAGE_PREFIX="build/package" -DOBS_DOWNLOAD=ON
+        cmake -H. -B"build/temp" \
+          -DCMAKE_INSTALL_PREFIX="build/distrib" \
+          -DCMAKE_PACKAGE_NAME="streamfx-${{ matrix.id }}" \
+          -DCMAKE_PACKAGE_PREFIX="build/package"
     - name: "Build Project"
       shell: bash
       run: |
@@ -84,10 +87,10 @@ jobs:
             id: ubuntu-18.04
           - ubuntu: bionic
             compiler: clang
-            compiler-cxx: clang
+            compiler-cxx: clang++
             compiler-version: 8
             runner: ubuntu-18.04
-            packages: clang-8
+            packages: clang-8 clang-format-8 clang-tidy-8
             extra_command: ""
             id: ubuntu-18.04-clang
           - ubuntu: focal
@@ -99,10 +102,10 @@ jobs:
             id: ubuntu-20.04
           - ubuntu: focal
             compiler: clang
-            compiler-cxx: clang
+            compiler-cxx: clang++
             compiler-version: 9
             runner: ubuntu-20.04
-            packages: clang-9
+            packages: clang-9 clang-format-9 clang-tidy-9
             extra_command: ""
             id: ubuntu-20.04-clang
     runs-on: ${{ matrix.runner }}
@@ -141,7 +144,11 @@ jobs:
     - name: "Configure Project"
       shell: bash
       run: |
-        cmake -H. -B"build/temp" -DCMAKE_INSTALL_PREFIX="build/distrib" -DCMAKE_PACKAGE_NAME="streamfx-${{ matrix.id }}" -DCMAKE_PACKAGE_PREFIX="build/package" -DOBS_DOWNLOAD=ON
+        cmake -H. -B"build/temp" \
+          -DCMAKE_INSTALL_PREFIX="build/distrib" \
+          -DCMAKE_PACKAGE_NAME="streamfx-${{ matrix.id }}" \
+          -DCMAKE_PACKAGE_PREFIX="build/package" \
+          -DENABLE_FILTER_NVIDIA_FACE_TRACKING=FALSE
     - name: "Build Project"
       shell: bash
       run: |
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 73d00af1..67e029ba 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       CC: clang-9
-      CXX: clang-9
+      CXX: clang++-9
       CMAKE_GENERATOR: "Ninja"
     steps:
     - name: "Clone Repository"
@@ -31,7 +31,7 @@ jobs:
           libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev \
           libcurl4-openssl-dev \
           checkinstall pkg-config \
-          clang clang-format
+          clang-9 clang-format-9 clang-tidy-9
     - name: "Cache: Prerequisites"
       uses: actions/cache@v2
       with:
@@ -44,8 +44,7 @@ jobs:
         cmake -H. -B"build/temp" \
           -DCMAKE_INSTALL_PREFIX="build/distrib" \
           -DCMAKE_PACKAGE_NAME="streamfx-${{ matrix.id }}" -DCMAKE_PACKAGE_PREFIX="build/package" \
-          -DOBS_DOWNLOAD=ON \
-          -DENABLE_CLANG=TRUE
+          -DENABLE_CLANG=TRUE -DENABLE_FILTER_NVIDIA_FACE_TRACKING=FALSE
         cmake --build "build/temp" --config RelWithDebInfo --target StreamFX_CLANG-FORMAT
     - name: "Validate Formatting"
       shell: bash