From f77763dcd55ceb0146ad7f38e9dc483c455339cb Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 30 May 2024 14:50:34 +0200 Subject: [PATCH] CI Linux: use libajantv2 also build the library shared --- .github/scripts/Linux/install_others.sh | 11 ++++++++--- .github/scripts/Linux/prepare.sh | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/scripts/Linux/install_others.sh b/.github/scripts/Linux/install_others.sh index 42ffbd15e..1a404b8ec 100755 --- a/.github/scripts/Linux/install_others.sh +++ b/.github/scripts/Linux/install_others.sh @@ -21,9 +21,14 @@ install_ximea() { # Install AJA install_aja() {( - git clone --depth 1 https://github.com/aja-video/ntv2 - cd ntv2/ajalibraries/ajantv2/build - make -j "$(nproc)" + git clone --depth 1 https://github.com/aja-video/libajantv2.git + cd libajantv2 + cmake -Bbuild -DAJANTV2_DISABLE_DEMOS=ON -DAJANTV2_DISABLE_DRIVER=ON \ + -DAJANTV2_DISABLE_TOOLS=ON -DAJANTV2_DISABLE_TESTS=ON \ + -DAJANTV2_DISABLE_PLUGINS=ON -DAJANTV2_BUILD_SHARED=ON \ + -DCMAKE_BUILD_TYPE=Release . + cmake --build build -j "$(nproc)" + sudo cmake --install build )} diff --git a/.github/scripts/Linux/prepare.sh b/.github/scripts/Linux/prepare.sh index fcdb4823c..78180b1ca 100755 --- a/.github/scripts/Linux/prepare.sh +++ b/.github/scripts/Linux/prepare.sh @@ -1,7 +1,7 @@ #!/bin/bash -eux export PKG_CONFIG_PATH=/usr/local/qt/lib/pkgconfig:/usr/local/lib/pkgconfig -printf "%b" "AJA_DIRECTORY=/var/tmp/ntv2\n\ +printf "%b" "\ CPATH=/usr/local/qt/include\n\ LIBRARY_PATH=/usr/local/qt/lib\n\ PKG_CONFIG_PATH=$PKG_CONFIG_PATH\n" >> "$GITHUB_ENV"