From 74f87df4d2f8b42448acf1b51d9718e4e39e99b9 Mon Sep 17 00:00:00 2001 From: Yannis Guyon Date: Tue, 4 Mar 2025 10:57:16 +0100 Subject: [PATCH] Ditch Ninja Use the default generator instead of specifying Ninja. --- .github/workflows/ci-disable-gtest.yml | 7 +++---- .github/workflows/ci-fuzztest.yml | 7 +++---- .github/workflows/ci-linux-artifacts.yml | 7 +++---- .github/workflows/ci-linux-coverage.yml | 10 ++++------ .github/workflows/ci-linux-golden-tests.yml | 7 +++---- .github/workflows/ci-macos-artifacts.yml | 7 +++---- .github/workflows/ci-mingw.yml | 8 +++----- .github/workflows/ci-unix-shared-installed.yml | 18 ++++++++---------- .github/workflows/ci-unix-shared-local.yml | 7 +++---- .github/workflows/ci-unix-static-av2.yml | 7 +++---- .../ci-unix-static-sanitized-memory.yml | 13 ++++++------- .github/workflows/ci-unix-static-sanitized.yml | 9 ++++----- .github/workflows/ci-unix-static.yml | 7 +++---- .github/workflows/ci-windows-artifacts.yml | 7 +++---- .github/workflows/ci-windows-installed.yml | 7 +++---- .github/workflows/ci-windows-shared-local.yml | 7 +++---- .github/workflows/ci-windows.yml | 7 +++---- android_jni/README.md | 1 - cmake/Modules/LocalDav1d.cmake | 5 ++--- ext/aom.cmd | 11 +++-------- ext/avm.cmd | 12 +++--------- ext/dav1d.cmd | 11 +++-------- ext/dav1d_android.sh | 9 +++------ ext/googletest.cmd | 9 +++------ ext/libargparse.cmd | 10 ++++------ ext/libgav1.cmd | 11 +++-------- ext/libgav1_android.sh | 16 ++++------------ ext/libjpeg.cmd | 2 +- ext/libsharpyuv.cmd | 10 +++------- ext/libxml2.cmd | 7 +++---- ext/libyuv.cmd | 10 ++++------ ext/svt.cmd | 2 +- ext/svt.sh | 2 +- tests/oss-fuzz/build.sh | 8 +++----- 34 files changed, 105 insertions(+), 173 deletions(-) diff --git a/.github/workflows/ci-disable-gtest.yml b/.github/workflows/ci-disable-gtest.yml index 28502ad008..615aa0c065 100644 --- a/.github/workflows/ci-disable-gtest.yml +++ b/.github/workflows/ci-disable-gtest.yml @@ -47,7 +47,7 @@ jobs: - name: Prepare libavif (cmake) run: > - cmake -G Ninja -S . -B build + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_DAV1D=LOCAL -DAVIF_CODEC_RAV1E=LOCAL -DAVIF_CODEC_SVT=LOCAL @@ -55,9 +55,8 @@ jobs: -DAVIF_BUILD_EXAMPLES=ON -DAVIF_BUILD_APPS=ON -DAVIF_BUILD_TESTS=ON -DAVIF_GTEST=OFF -DAVIF_ENABLE_WERROR=ON - - name: Build libavif (ninja) - working-directory: ./build - run: ninja + - name: Build libavif + run: cmake --build build --parallel - name: Run AVIF Tests working-directory: ./build run: ctest -j $(getconf _NPROCESSORS_ONLN) --output-on-failure diff --git a/.github/workflows/ci-fuzztest.yml b/.github/workflows/ci-fuzztest.yml index 076f9bb034..42658288bb 100644 --- a/.github/workflows/ci-fuzztest.yml +++ b/.github/workflows/ci-fuzztest.yml @@ -38,7 +38,7 @@ jobs: - name: Prepare libavif (cmake) run: > - cmake -G Ninja -S . -B build + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_DAV1D=LOCAL -DAVIF_LIBSHARPYUV=LOCAL -DAVIF_LIBXML2=LOCAL @@ -51,9 +51,8 @@ jobs: -DAVIF_FUZZTEST=LOCAL -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DAVIF_ENABLE_WERROR=ON - - name: Build libavif (ninja) - working-directory: ./build - run: ninja + - name: Build libavif + run: cmake --build build --parallel - name: Run fuzztest AVIF Tests working-directory: ./build run: ctest -j $(getconf _NPROCESSORS_ONLN) --output-on-failure -R fuzztest diff --git a/.github/workflows/ci-linux-artifacts.yml b/.github/workflows/ci-linux-artifacts.yml index 86780a580c..1c21216271 100644 --- a/.github/workflows/ci-linux-artifacts.yml +++ b/.github/workflows/ci-linux-artifacts.yml @@ -26,7 +26,7 @@ jobs: - name: Prepare libavif (cmake) run: > - cmake -G Ninja -S . -B build + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_AOM_ENCODE=ON -DAVIF_CODEC_AOM_DECODE=OFF -DAVIF_CODEC_DAV1D=LOCAL @@ -35,9 +35,8 @@ jobs: -DAVIF_BUILD_EXAMPLES=OFF -DAVIF_BUILD_APPS=ON -DAVIF_BUILD_TESTS=OFF -DAVIF_ENABLE_WERROR=ON -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ - - name: Build libavif (ninja) - working-directory: ./build - run: ninja + - name: Build libavif + run: cmake --build build --parallel - name: Archive artifacts uses: thedoctor0/zip-release@b57d897cb5d60cb78b51a507f63fa184cfe35554 # 0.7.6 with: diff --git a/.github/workflows/ci-linux-coverage.yml b/.github/workflows/ci-linux-coverage.yml index b594e8031c..cc9a20acf5 100644 --- a/.github/workflows/ci-linux-coverage.yml +++ b/.github/workflows/ci-linux-coverage.yml @@ -33,7 +33,7 @@ jobs: - name: Prepare libavif (cmake) run: > - cmake -G Ninja -S . -B build + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_DAV1D=LOCAL -DAVIF_LIBSHARPYUV=LOCAL -DAVIF_LIBXML2=LOCAL @@ -46,12 +46,10 @@ jobs: -DAVIF_ENABLE_EXPERIMENTAL_EXTENDED_PIXI=ON -DAVIF_ENABLE_WERROR=ON -DAVIF_ENABLE_COVERAGE=ON -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ - - name: Build libavif (ninja) - working-directory: ./build - run: ninja + - name: Build libavif + run: cmake --build build --parallel - name: Run AVIF coverage - working-directory: ./build - run: ninja avif_coverage + run: cmake --build build --target avif_coverage --parallel # See https://docs.github.com/en/actions/using-workflows/storing-workflow-data-as-artifacts - name: Archive coverage output diff --git a/.github/workflows/ci-linux-golden-tests.yml b/.github/workflows/ci-linux-golden-tests.yml index 83b0e127cf..9e938ff83a 100644 --- a/.github/workflows/ci-linux-golden-tests.yml +++ b/.github/workflows/ci-linux-golden-tests.yml @@ -42,7 +42,7 @@ jobs: - name: Prepare libavif (cmake) run: > - cmake -G Ninja -S . -B build + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DAVIF_CODEC_AOM=LOCAL -DAVIF_LIBYUV=LOCAL -DAVIF_BUILD_EXAMPLES=ON -DAVIF_BUILD_APPS=ON @@ -50,9 +50,8 @@ jobs: -DAVIF_BUILD_TESTS=ON -DAVIF_ENABLE_GOLDEN_TESTS=ON -DAVIF_GTEST=OFF -DAVIF_ENABLE_WERROR=ON -DGOLDEN_TESTS_OUTPUT_DIR=${{ runner.temp }}/golden_tests - - name: Build libavif (ninja) - working-directory: ./build - run: ninja + - name: Build libavif + run: cmake --build build --parallel - name: Run AVIF golden tests working-directory: ./build # Runs test that have "golden" in their name. diff --git a/.github/workflows/ci-macos-artifacts.yml b/.github/workflows/ci-macos-artifacts.yml index 7e017b23df..574d6120d6 100644 --- a/.github/workflows/ci-macos-artifacts.yml +++ b/.github/workflows/ci-macos-artifacts.yml @@ -25,7 +25,7 @@ jobs: - name: Prepare libavif (cmake) run: > - cmake -G Ninja -S . -B build + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_AOM_ENCODE=ON -DAVIF_CODEC_AOM_DECODE=OFF -DAVIF_CODEC_DAV1D=LOCAL @@ -34,9 +34,8 @@ jobs: -DAVIF_BUILD_EXAMPLES=OFF -DAVIF_BUILD_APPS=ON -DAVIF_BUILD_TESTS=OFF -DAVIF_ENABLE_WERROR=ON -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ - - name: Build libavif (ninja) - working-directory: ./build - run: ninja + - name: Build libavif + run: cmake --build build --parallel # TODO: notarize the binaries - name: Create README.txt run: | diff --git a/.github/workflows/ci-mingw.yml b/.github/workflows/ci-mingw.yml index 9b7de4a5c4..e8dde35107 100644 --- a/.github/workflows/ci-mingw.yml +++ b/.github/workflows/ci-mingw.yml @@ -44,7 +44,6 @@ jobs: libjpeg-turbo:p libpng:p libyuv:p - ninja:p zlib:p - uses: ./.github/actions/cache with: @@ -54,7 +53,7 @@ jobs: - name: Prepare libavif (cmake) run: > - cmake -G Ninja -S . -B build + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DAVIF_CODEC_AOM=SYSTEM -DAVIF_CODEC_AOM_DECODE=OFF -DAVIF_CODEC_AOM_ENCODE=ON @@ -64,9 +63,8 @@ jobs: -DAVIF_BUILD_TESTS=ON -DAVIF_GTEST=LOCAL -DAVIF_BUILD_GDK_PIXBUF=ON -DAVIF_ENABLE_WERROR=ON - - name: Build libavif (ninja) - working-directory: ./build - run: ninja + - name: Build libavif + run: cmake --build build --parallel - name: Run AVIF Tests working-directory: ./build run: ctest -j --output-on-failure diff --git a/.github/workflows/ci-unix-shared-installed.yml b/.github/workflows/ci-unix-shared-installed.yml index 068551c0a6..cfbdc2a913 100644 --- a/.github/workflows/ci-unix-shared-installed.yml +++ b/.github/workflows/ci-unix-shared-installed.yml @@ -57,7 +57,7 @@ jobs: - name: Prepare libavif (cmake) run: > - cmake -G Ninja -S . -B build + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DAVIF_CODEC_AOM=SYSTEM -DAVIF_CODEC_AOM_DECODE=OFF -DAVIF_CODEC_AOM_ENCODE=ON @@ -66,15 +66,14 @@ jobs: -DAVIF_BUILD_TESTS=ON -DAVIF_GTEST=SYSTEM -DAVIF_BUILD_GDK_PIXBUF=ON -DCMAKE_INSTALL_PREFIX=./build/install -DAVIF_ENABLE_WERROR=ON ${{ env.CMAKE_AVIF_FLAGS }} - - name: Build libavif (ninja) - working-directory: ./build - run: ninja + - name: Build libavif + run: cmake --build build --parallel - name: Run AVIF Tests working-directory: ./build run: ctest -j $(getconf _NPROCESSORS_ONLN) --output-on-failure - name: Install AVIF - working-directory: ./build - run: ninja install + # cmake --install was introduced in CMake version 3.15. + run: cmake --build build --target install - name: Test installed cmake working-directory: ./build run: > @@ -95,7 +94,7 @@ jobs: # CMake 3.21 is needed to force C23 for [[nodiscard]]. if: runner.oldest-cmake == 'false' run: > - cmake -G Ninja -S . -B build_nodiscard + cmake -S . -B build_nodiscard -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DAVIF_CODEC_AOM=SYSTEM -DAVIF_CODEC_AOM_DECODE=OFF -DAVIF_CODEC_AOM_ENCODE=ON @@ -104,7 +103,6 @@ jobs: -DAVIF_BUILD_EXAMPLES=ON -DAVIF_BUILD_APPS=ON -DAVIF_BUILD_TESTS=ON -DAVIF_GTEST=LOCAL -DAVIF_BUILD_GDK_PIXBUF=ON ${{ env.CMAKE_AVIF_FLAGS }} - - name: Build libavif with [[nodiscard]] (ninja) + - name: Build libavif with [[nodiscard]] if: runner.oldest-cmake == 'false' - working-directory: ./build_nodiscard - run: ninja + run: cmake --build build_nodiscard --parallel diff --git a/.github/workflows/ci-unix-shared-local.yml b/.github/workflows/ci-unix-shared-local.yml index 56fcb10169..81ffc65c05 100644 --- a/.github/workflows/ci-unix-shared-local.yml +++ b/.github/workflows/ci-unix-shared-local.yml @@ -47,7 +47,7 @@ jobs: - name: Prepare libavif (cmake) run: > - cmake -G Ninja -S . -B build + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_DAV1D=LOCAL -DAVIF_LIBSHARPYUV=LOCAL -DAVIF_LIBXML2=LOCAL @@ -58,9 +58,8 @@ jobs: -DAVIF_ENABLE_EXPERIMENTAL_SAMPLE_TRANSFORM=ON -DAVIF_ENABLE_EXPERIMENTAL_EXTENDED_PIXI=ON -DAVIF_ENABLE_WERROR=ON - - name: Build libavif (ninja) - working-directory: ./build - run: ninja + - name: Build libavif + run: cmake --build build --parallel - name: Run AVIF Tests working-directory: ./build run: ctest -j $(getconf _NPROCESSORS_ONLN) --output-on-failure diff --git a/.github/workflows/ci-unix-static-av2.yml b/.github/workflows/ci-unix-static-av2.yml index 631d7159ab..26f68e48b9 100644 --- a/.github/workflows/ci-unix-static-av2.yml +++ b/.github/workflows/ci-unix-static-av2.yml @@ -42,7 +42,7 @@ jobs: - name: Prepare libavif (cmake) run: > - cmake -G Ninja -S . -B build + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DAVIF_CODEC_AVM=LOCAL -DAVIF_CODEC_DAV1D=${{ matrix.also-enable-av1-codecs }} @@ -53,9 +53,8 @@ jobs: -DAVIF_BUILD_EXAMPLES=ON -DAVIF_BUILD_APPS=ON -DAVIF_BUILD_TESTS=ON -DAVIF_GTEST=LOCAL -DAVIF_ENABLE_WERROR=ON - - name: Build libavif (ninja) - working-directory: ./build - run: ninja + - name: Build libavif + run: cmake --build build --parallel - name: Run AVIF Tests working-directory: ./build run: ctest -j $(getconf _NPROCESSORS_ONLN) --output-on-failure diff --git a/.github/workflows/ci-unix-static-sanitized-memory.yml b/.github/workflows/ci-unix-static-sanitized-memory.yml index d77be8479e..7604aea200 100644 --- a/.github/workflows/ci-unix-static-sanitized-memory.yml +++ b/.github/workflows/ci-unix-static-sanitized-memory.yml @@ -36,7 +36,7 @@ jobs: # clone LLVM git clone --depth=1 --branch llvmorg-19.1.7 https://github.com/llvm/llvm-project # configure cmake - cmake -G Ninja -S llvm-project/runtimes -B llvm-project/msan_out \ + cmake -S llvm-project/runtimes -B llvm-project/msan_out \ -DCMAKE_BUILD_TYPE=Release \ -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \ -DCMAKE_C_COMPILER=clang \ @@ -56,7 +56,7 @@ jobs: if: ${{ steps.cache-hit.outputs.hit == 'false' }} working-directory: ./ext run: | - sed -i -e 's/cmake -S \(.*\)/cmake -S \1 -DWITH_SIMD=OFF/g' libjpeg.cmd + sed -i -e 's/cmake -S/cmake -DWITH_SIMD=OFF -S/g' libjpeg.cmd ./libjpeg.cmd env: CFLAGS: ${{ env.CI_CFLAGS }} @@ -68,7 +68,7 @@ jobs: if: ${{ steps.cache-hit.outputs.hit == 'false' }} working-directory: ./ext run: | - sed -i -e 's/cmake -G Ninja \(.*\) \.\./cmake -G Ninja \1 -DAOM_TARGET_CPU=generic -DSANITIZE=memory ../g' aom.cmd + sed -i -e 's/cmake -S/cmake -DAOM_TARGET_CPU=generic -DSANITIZE=memory -S/g' aom.cmd ./aom.cmd env: CFLAGS: ${{ env.CI_CFLAGS }} @@ -89,7 +89,7 @@ jobs: - name: Prepare libavif (cmake) run: > - cmake -S . -B build -G Ninja + cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=OFF -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_DAV1D=LOCAL -DAVIF_JPEG=LOCAL -DAVIF_LIBSHARPYUV=LOCAL @@ -100,9 +100,8 @@ jobs: CFLAGS: ${{ env.CI_CFLAGS }} CXXFLAGS: ${{ env.CI_CXXFLAGS }} LDFLAGS: ${{ env.CI_LDFLAGS }} - - name: Build libavif (ninja) - working-directory: ./build - run: ninja + - name: Build libavif + run: cmake --build build --parallel - name: Run AVIF Tests working-directory: ./build run: ctest -j $(getconf _NPROCESSORS_ONLN) --output-on-failure diff --git a/.github/workflows/ci-unix-static-sanitized.yml b/.github/workflows/ci-unix-static-sanitized.yml index 1d22407b02..f7a894a316 100644 --- a/.github/workflows/ci-unix-static-sanitized.yml +++ b/.github/workflows/ci-unix-static-sanitized.yml @@ -57,7 +57,7 @@ jobs: if: ${{ steps.cache-hit.outputs.hit == 'false' }} working-directory: ./ext run: | - sed -i -e 's/cmake -G Ninja \(.*\) \.\./cmake -G Ninja \1 -DSANITIZE=${{ matrix.sanitizer }} ../g' aom.cmd + sed -i -e 's/cmake -S/cmake -DSANITIZE=${{ matrix.sanitizer }} -S/g' aom.cmd ./aom.cmd env: CFLAGS: ${{ env.CI_CFLAGS }} @@ -80,7 +80,7 @@ jobs: - name: Prepare libavif (cmake) run: > - cmake -S . -B build -G Ninja + cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=OFF -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_DAV1D=LOCAL -DAVIF_LIBYUV=LOCAL -DAVIF_LIBSHARPYUV=LOCAL @@ -90,9 +90,8 @@ jobs: CFLAGS: ${{ env.CI_CFLAGS }} CXXFLAGS: ${{ env.CI_CXXFLAGS }} LDFLAGS: ${{ env.CI_LDFLAGS }} - - name: Build libavif (ninja) - working-directory: ./build - run: ninja + - name: Build libavif + run: cmake --build build --parallel - name: Run AVIF Tests working-directory: ./build run: ctest -j $(getconf _NPROCESSORS_ONLN) --output-on-failure diff --git a/.github/workflows/ci-unix-static.yml b/.github/workflows/ci-unix-static.yml index 28c23706d1..d8f8605a00 100644 --- a/.github/workflows/ci-unix-static.yml +++ b/.github/workflows/ci-unix-static.yml @@ -51,7 +51,7 @@ jobs: - name: Prepare libavif (cmake) run: > - cmake -G Ninja -S . -B build + cmake -S . -B build -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DBUILD_SHARED_LIBS=OFF -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_DAV1D=LOCAL -DAVIF_CODEC_RAV1E=LOCAL -DAVIF_CODEC_SVT=LOCAL @@ -63,9 +63,8 @@ jobs: -DAVIF_ENABLE_EXPERIMENTAL_SAMPLE_TRANSFORM=ON -DAVIF_ENABLE_EXPERIMENTAL_EXTENDED_PIXI=ON -DAVIF_ENABLE_WERROR=ON - - name: Build libavif (ninja) - working-directory: ./build - run: ninja + - name: Build libavif + run: cmake --build build --parallel - name: Run AVIF Tests working-directory: ./build run: ctest -j $(getconf _NPROCESSORS_ONLN) --output-on-failure diff --git a/.github/workflows/ci-windows-artifacts.yml b/.github/workflows/ci-windows-artifacts.yml index a2fab4ea98..a1b63246a1 100644 --- a/.github/workflows/ci-windows-artifacts.yml +++ b/.github/workflows/ci-windows-artifacts.yml @@ -56,7 +56,7 @@ jobs: - name: Prepare libavif (cmake) run: > - cmake -G Ninja -S . -B build + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_AOM_ENCODE=ON -DAVIF_CODEC_AOM_DECODE=OFF -DAVIF_CODEC_DAV1D=LOCAL @@ -64,9 +64,8 @@ jobs: -DAVIF_JPEG=LOCAL -DAVIF_ZLIBPNG=LOCAL -DAVIF_BUILD_EXAMPLES=OFF -DAVIF_BUILD_APPS=ON -DAVIF_BUILD_TESTS=OFF -DAVIF_ENABLE_WERROR=ON - - name: Build libavif (ninja) - working-directory: ./build - run: ninja + - name: Build libavif + run: cmake --build build --parallel - name: Archive artifacts uses: thedoctor0/zip-release@b57d897cb5d60cb78b51a507f63fa184cfe35554 # 0.7.6 with: diff --git a/.github/workflows/ci-windows-installed.yml b/.github/workflows/ci-windows-installed.yml index 54c3f22d79..fdb2d70106 100644 --- a/.github/workflows/ci-windows-installed.yml +++ b/.github/workflows/ci-windows-installed.yml @@ -65,7 +65,7 @@ jobs: mv ${{ github.workspace }}\tmp\rav1e-windows-msvc-sdk\lib\pkgconfig\* ${{ github.workspace }}\vcpkg\installed\x64-windows-release\lib\pkgconfig - name: Prepare libavif (cmake) run: > - cmake ${{ steps.vcpkg.outputs.vcpkg-cmake-config }} -G Ninja -S . -B build + cmake ${{ steps.vcpkg.outputs.vcpkg-cmake-config }} -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DAVIF_CODEC_AOM=SYSTEM -DAVIF_CODEC_DAV1D=SYSTEM -DAVIF_CODEC_RAV1E=SYSTEM @@ -77,9 +77,8 @@ jobs: -DAVIF_ENABLE_EXPERIMENTAL_SAMPLE_TRANSFORM=ON -DAVIF_ENABLE_EXPERIMENTAL_EXTENDED_PIXI=ON -DAVIF_ENABLE_WERROR=ON $env:AVIF_CMAKE_C_COMPILER $env:AVIF_CMAKE_CXX_COMPILER - - name: Build libavif (ninja) - working-directory: ./build - run: ninja + - name: Build libavif + run: cmake --build build --parallel - name: Run AVIF Tests working-directory: ./build run: ctest -j $Env:NUMBER_OF_PROCESSORS --output-on-failure diff --git a/.github/workflows/ci-windows-shared-local.yml b/.github/workflows/ci-windows-shared-local.yml index 8dd8901815..a78c8b21cc 100644 --- a/.github/workflows/ci-windows-shared-local.yml +++ b/.github/workflows/ci-windows-shared-local.yml @@ -47,7 +47,7 @@ jobs: - name: Prepare libavif (cmake) run: > - cmake -G Ninja -S . -B build + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_DAV1D=LOCAL -DAVIF_JPEG=LOCAL -DAVIF_LIBSHARPYUV=LOCAL -DAVIF_LIBXML2=LOCAL @@ -58,9 +58,8 @@ jobs: -DAVIF_ENABLE_EXPERIMENTAL_SAMPLE_TRANSFORM=ON -DAVIF_ENABLE_EXPERIMENTAL_EXTENDED_PIXI=ON -DAVIF_ENABLE_WERROR=ON $env:AVIF_CMAKE_C_COMPILER $env:AVIF_CMAKE_CXX_COMPILER - - name: Build libavif (ninja) - working-directory: ./build - run: ninja + - name: Build libavif + run: cmake --build build --parallel - name: Run AVIF Tests working-directory: ./build run: ctest -j $Env:NUMBER_OF_PROCESSORS --output-on-failure diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index 6f272da07a..a328def5bf 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -58,7 +58,7 @@ jobs: - name: Prepare libavif (cmake) run: > - cmake -G Ninja -S . -B build + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_DAV1D=LOCAL -DAVIF_CODEC_RAV1E=LOCAL -DAVIF_CODEC_SVT=LOCAL @@ -71,9 +71,8 @@ jobs: -DAVIF_ENABLE_EXPERIMENTAL_SAMPLE_TRANSFORM=ON -DAVIF_ENABLE_EXPERIMENTAL_EXTENDED_PIXI=ON -DAVIF_ENABLE_WERROR=ON - - name: Build libavif (ninja) - working-directory: ./build - run: ninja + - name: Build libavif + run: cmake --build build --parallel - name: Run AVIF Tests working-directory: ./build run: ctest -j $Env:NUMBER_OF_PROCESSORS --output-on-failure diff --git a/android_jni/README.md b/android_jni/README.md index 3f67047651..7ac38a337a 100644 --- a/android_jni/README.md +++ b/android_jni/README.md @@ -9,7 +9,6 @@ This subdirectory contains Android JNI bindings that will enable use of the liba * [Android NDK](https://developer.android.com/ndk/downloads) - For building the decoder (in the examples, we use dav1d). * [Gradle](https://gradle.org/). * CMake. -* Ninja. ## Generate the AAR package diff --git a/cmake/Modules/LocalDav1d.cmake b/cmake/Modules/LocalDav1d.cmake index 105f02153f..90b6cb4a3b 100644 --- a/cmake/Modules/LocalDav1d.cmake +++ b/cmake/Modules/LocalDav1d.cmake @@ -13,7 +13,6 @@ function(avif_build_local_dav1d) ) endif() - find_program(NINJA_EXECUTABLE NAMES ninja ninja-build REQUIRED) find_program(MESON_EXECUTABLE meson REQUIRED) set(PATH $ENV{PATH}) @@ -90,8 +89,8 @@ function(avif_build_local_dav1d) ${CMAKE_COMMAND} -E env "PATH=${PATH}" ${MESON_EXECUTABLE} setup --buildtype=release --default-library=static --prefix= --libdir=lib -Denable_asm=true -Denable_tools=false -Denable_examples=false -Denable_tests=false ${EXTRA_ARGS} - BUILD_COMMAND ${CMAKE_COMMAND} -E env "PATH=${PATH}" ${NINJA_EXECUTABLE} -C - INSTALL_COMMAND ${CMAKE_COMMAND} -E env "PATH=${PATH}" ${NINJA_EXECUTABLE} -C install + BUILD_COMMAND ${CMAKE_COMMAND} -E env "PATH=${PATH}" ${MESON_EXECUTABLE} compile -C + INSTALL_COMMAND ${CMAKE_COMMAND} -E env "PATH=${PATH}" ${MESON_EXECUTABLE} install -C BUILD_BYPRODUCTS /lib/libdav1d.a ) diff --git a/ext/aom.cmd b/ext/aom.cmd index 3f3804e2f4..78b8dfbab2 100755 --- a/ext/aom.cmd +++ b/ext/aom.cmd @@ -3,17 +3,12 @@ : # The odd choice of comment style in this file is to try to share this script between *nix and win32. -: # cmake and ninja must be in your PATH. +: # cmake must be in your PATH. : # If you're running this on Windows, be sure you've already run this (from your VC2019 install dir): : # "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" git clone -b v3.12.0 --depth 1 https://aomedia.googlesource.com/aom -cd aom -mkdir build.libavif -cd build.libavif - -cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCONFIG_PIC=1 -DCMAKE_BUILD_TYPE=Release -DENABLE_DOCS=0 -DENABLE_EXAMPLES=0 -DENABLE_TESTDATA=0 -DENABLE_TESTS=0 -DENABLE_TOOLS=0 .. -cd ../.. -ninja -C aom/build.libavif +cmake -S aom -B aom/build.libavif -DBUILD_SHARED_LIBS=OFF -DCONFIG_PIC=1 -DCMAKE_BUILD_TYPE=Release -DENABLE_DOCS=0 -DENABLE_EXAMPLES=0 -DENABLE_TESTDATA=0 -DENABLE_TESTS=0 -DENABLE_TOOLS=0 +cmake --build aom/build.libavif --parallel diff --git a/ext/avm.cmd b/ext/avm.cmd index 4fccce907f..741bdad6e9 100755 --- a/ext/avm.cmd +++ b/ext/avm.cmd @@ -3,18 +3,12 @@ : # The odd choice of comment style in this file is to try to share this script between *nix and win32. -: # cmake and ninja must be in your PATH. +: # cmake must be in your PATH. : # If you're running this on Windows, be sure you've already run this (from your VC2019 install dir): : # "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" git clone -b research-v9.0.0 --depth 1 https://gitlab.com/AOMediaCodec/avm.git -cd avm - -mkdir build.libavif -cd build.libavif - -cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCONFIG_PIC=1 -DCMAKE_BUILD_TYPE=Release -DENABLE_DOCS=0 -DENABLE_EXAMPLES=0 -DENABLE_TESTS=0 -DENABLE_TOOLS=0 .. -cd ../.. -ninja -C avm/build.libavif +cmake -S avm -B avm/build.libavif -DBUILD_SHARED_LIBS=OFF -DCONFIG_PIC=1 -DCMAKE_BUILD_TYPE=Release -DENABLE_DOCS=0 -DENABLE_EXAMPLES=0 -DENABLE_TESTS=0 -DENABLE_TOOLS=0 +cmake --build avm/build.libavif --parallel diff --git a/ext/dav1d.cmd b/ext/dav1d.cmd index fb0b29b07e..ee86925c61 100755 --- a/ext/dav1d.cmd +++ b/ext/dav1d.cmd @@ -3,7 +3,7 @@ : # The odd choice of comment style in this file is to try to share this script between *nix and win32. -: # meson and ninja must be in your PATH. +: # meson must be in your PATH. : # If you're running this on Windows, be sure you've already run this (from your VC2019 install dir): : # "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" @@ -11,14 +11,9 @@ : # When updating the dav1d version, make the same change to dav1d_android.sh. git clone -b 1.5.1 --depth 1 https://code.videolan.org/videolan/dav1d.git -cd dav1d -mkdir build -cd build - : # macOS might require: -Dc_args=-fno-stack-check : # Build with asan: -Db_sanitize=address -Db_lundef=false : # Build with msan: -Db_sanitize=memory -Db_lundef=false -Denable_asm=false : # Build with ubsan: -Db_sanitize=undefined -Db_lundef=false -meson setup --default-library=static --buildtype release -Denable_tools=false -Denable_tests=false .. -cd ../.. -ninja -C dav1d/build +meson setup --default-library=static --buildtype release -Denable_tools=false -Denable_tests=false dav1d/build dav1d +meson compile -C dav1d/build diff --git a/ext/dav1d_android.sh b/ext/dav1d_android.sh index c615231dbf..dbd0b3312d 100755 --- a/ext/dav1d_android.sh +++ b/ext/dav1d_android.sh @@ -16,9 +16,7 @@ if [ $# -ne 1 ]; then exit 1 fi git clone -b 1.5.1 --depth 1 https://code.videolan.org/videolan/dav1d.git -cd dav1d -mkdir build -cd build +mkdir dav1d/build # This only works on linux and mac. if [ "$(uname)" == "Darwin" ]; then @@ -32,12 +30,11 @@ ABI_LIST=("armeabi-v7a" "arm64-v8a" "x86" "x86_64") ARCH_LIST=("arm" "aarch64" "x86" "x86_64") for i in "${!ABI_LIST[@]}"; do abi="${ABI_LIST[i]}" - mkdir "${abi}" cd "${abi}" PATH=$PATH:${android_bin} meson setup --default-library=static --buildtype release \ --cross-file="../../package/crossfiles/${ARCH_LIST[i]}-android.meson" \ - -Denable_tools=false -Denable_tests=false ../.. - PATH=$PATH:${android_bin} ninja + -Denable_tools=false -Denable_tests=false "dav1d/build/${abi}" dav1d + PATH=$PATH:${android_bin} meson compile -C "dav1d/build/${abi}" cd .. done diff --git a/ext/googletest.cmd b/ext/googletest.cmd index 1c0ce97c08..e55e54fd08 100755 --- a/ext/googletest.cmd +++ b/ext/googletest.cmd @@ -8,12 +8,9 @@ : # "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" git clone -b v1.14.0 --depth 1 https://github.com/google/googletest.git -cd googletest -mkdir build -cd build + : # The gtest_force_shared_crt option makes gtest link the Microsoft C runtime library (CRT) dynamically : # on Windows: : # https://github.com/google/googletest/blob/main/googletest/README.md#visual-studio-dynamic-vs-static-runtimes -cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_GMOCK=OFF -Dgtest_force_shared_crt=ON .. -cd ../.. -ninja -C googletest/build +cmake -S googletest -B googletest/build -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_GMOCK=OFF -Dgtest_force_shared_crt=ON .. +cmake --build googletest/build --parallel diff --git a/ext/libargparse.cmd b/ext/libargparse.cmd index d04045cfe9..39576c1b04 100755 --- a/ext/libargparse.cmd +++ b/ext/libargparse.cmd @@ -3,7 +3,7 @@ : # The odd choice of comment style in this file is to try to share this script between *nix and win32. -: # cmake and ninja must be in your PATH. +: # cmake must be in your PATH. : # If you're running this on Windows, be sure you've already run this (from your VC2019 install dir): : # "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" @@ -12,9 +12,7 @@ git clone https://github.com/maryla-uc/libargparse.git cd libargparse git checkout 81998ffafb9c2ac8cf488d31e536a2e6fd6b3fdf +cd .. -mkdir build -cd build -cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release .. -cd ../.. -ninja -C libargparse/build +cmake -S libargparse -B libargparse/build -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release +cmake --build libargparse/build --parallel diff --git a/ext/libgav1.cmd b/ext/libgav1.cmd index 9134abcc57..b1b292c15a 100755 --- a/ext/libgav1.cmd +++ b/ext/libgav1.cmd @@ -3,7 +3,7 @@ : # The odd choice of comment style in this file is to try to share this script between *nix and win32. -: # cmake and ninja must be in your PATH. +: # cmake must be in your PATH. : # If you're running this on Windows, be sure you've already run this (from your VC2019 install dir): : # "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" @@ -11,10 +11,5 @@ : # When updating the libgav1 version, make the same change to libgav1_android.sh. git clone -b v0.19.0 --depth 1 https://chromium.googlesource.com/codecs/libgav1 -cd libgav1 -mkdir build -cd build - -cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DLIBGAV1_THREADPOOL_USE_STD_MUTEX=1 -DLIBGAV1_ENABLE_EXAMPLES=0 -DLIBGAV1_ENABLE_TESTS=0 -DLIBGAV1_MAX_BITDEPTH=12 .. -cd ../.. -ninja -C libgav1/build +cmake -S libgav1 -B libgav1/build -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DLIBGAV1_THREADPOOL_USE_STD_MUTEX=1 -DLIBGAV1_ENABLE_EXAMPLES=0 -DLIBGAV1_ENABLE_TESTS=0 -DLIBGAV1_MAX_BITDEPTH=12 +cmake --build libgav1/build --parallel diff --git a/ext/libgav1_android.sh b/ext/libgav1_android.sh index 194a0fef1d..29227255da 100755 --- a/ext/libgav1_android.sh +++ b/ext/libgav1_android.sh @@ -18,17 +18,12 @@ fi # When updating the libgav1 version, make the same change to libgav1.cmd. git clone -b v0.19.0 --depth 1 https://chromium.googlesource.com/codecs/libgav1 -cd libgav1 -mkdir build -cd build +mkdir libgav1/build ABI_LIST="armeabi-v7a arm64-v8a x86 x86_64" for abi in ${ABI_LIST}; do - mkdir "${abi}" - cd "${abi}" - cmake ../.. \ - -G Ninja \ - -DCMAKE_TOOLCHAIN_FILE=../../cmake/toolchains/android.cmake \ + cmake -S libgav1 -B "libgav1/build/${abi}" \ + -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/android.cmake \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DCMAKE_BUILD_TYPE=Release \ -DLIBGAV1_ANDROID_NDK_PATH=${1} \ @@ -37,8 +32,5 @@ for abi in ${ABI_LIST}; do -DLIBGAV1_ENABLE_TESTS=0 \ -DLIBGAV1_MAX_BITDEPTH=12 \ -DANDROID_ABI=${abi} - ninja - cd .. + cmake --build "libgav1/build/${abi}" --parallel done - -cd ../.. diff --git a/ext/libjpeg.cmd b/ext/libjpeg.cmd index 6a97c420de..67d7082fae 100755 --- a/ext/libjpeg.cmd +++ b/ext/libjpeg.cmd @@ -13,5 +13,5 @@ git clone -b 3.0.4 --depth 1 https://github.com/libjpeg-turbo/libjpeg-turbo.git # Manually-specified variables were not used by the project: # # WITH_CRT_DLL -cmake -S libjpeg-turbo -B libjpeg-turbo/build.libavif -G Ninja -DENABLE_SHARED=OFF -DENABLE_STATIC=ON -DCMAKE_BUILD_TYPE=Release -DWITH_TURBOJPEG=OFF -DWITH_CRT_DLL=ON +cmake -S libjpeg-turbo -B libjpeg-turbo/build.libavif -DENABLE_SHARED=OFF -DENABLE_STATIC=ON -DCMAKE_BUILD_TYPE=Release -DWITH_TURBOJPEG=OFF -DWITH_CRT_DLL=ON cmake --build libjpeg-turbo/build.libavif --parallel diff --git a/ext/libsharpyuv.cmd b/ext/libsharpyuv.cmd index 11be448af9..953f17cde4 100755 --- a/ext/libsharpyuv.cmd +++ b/ext/libsharpyuv.cmd @@ -3,7 +3,7 @@ : # The odd choice of comment style in this file is to try to share this script between *nix and win32. -: # cmake and ninja must be in your PATH. +: # cmake must be in your PATH. : # If you're running this on Windows, be sure you've already run this (from your VC2019 install dir): : # "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" @@ -11,9 +11,5 @@ : # libsharpyuv is part of the libwebp repo. git clone -b v1.4.0 --depth 1 https://chromium.googlesource.com/webm/libwebp -cd libwebp -mkdir build -cd build -cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF -DWEBP_BUILD_DWEBP=OFF -DWEBP_BUILD_GIF2WEBP=OFF -DWEBP_BUILD_IMG2WEBP=OFF -DWEBP_BUILD_VWEBP=OFF -DWEBP_BUILD_WEBPINFO=OFF -DWEBP_BUILD_LIBWEBPMUX=OFF -DWEBP_BUILD_WEBPMUX=OFF -DWEBP_BUILD_EXTRAS=OFF .. -cd ../.. -ninja -C libwebp/build sharpyuv +cmake -S libwebp -B libwebp/build -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF -DWEBP_BUILD_DWEBP=OFF -DWEBP_BUILD_GIF2WEBP=OFF -DWEBP_BUILD_IMG2WEBP=OFF -DWEBP_BUILD_VWEBP=OFF -DWEBP_BUILD_WEBPINFO=OFF -DWEBP_BUILD_LIBWEBPMUX=OFF -DWEBP_BUILD_WEBPMUX=OFF -DWEBP_BUILD_EXTRAS=OFF +cmake --build libwebp/build --target sharpyuv --parallel diff --git a/ext/libxml2.cmd b/ext/libxml2.cmd index a7b43bd51f..11aa3521fc 100755 --- a/ext/libxml2.cmd +++ b/ext/libxml2.cmd @@ -7,8 +7,7 @@ git clone -b v2.13.5 --depth 1 https://github.com/GNOME/libxml2.git -mkdir -p libxml2/build.libavif -cmake libxml2 -B libxml2/build.libavif/ -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=libxml2/install.libavif \ +cmake -S libxml2 -B libxml2/build.libavif/ -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=libxml2/install.libavif \ -DLIBXML2_WITH_PYTHON=OFF -DLIBXML2_WITH_ZLIB=OFF -DLIBXML2_WITH_LZMA=OFF -ninja -C libxml2/build.libavif -ninja -C libxml2/build.libavif install +cmake --build libxml2/build.libavif --parallel +cmake --install libxml2/build.libavif diff --git a/ext/libyuv.cmd b/ext/libyuv.cmd index cfd76105a9..b4ac5e2ab2 100755 --- a/ext/libyuv.cmd +++ b/ext/libyuv.cmd @@ -2,7 +2,7 @@ : # The odd choice of comment style in this file is to try to share this script between *nix and win32. -: # cmake and ninja must be in your PATH. +: # cmake must be in your PATH. : # If you're running this on Windows, be sure you've already run this (from your VC2019 install dir): : # "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" @@ -21,9 +21,7 @@ git checkout ccdf87034 git apply --ignore-whitespace ../libyuv.patch -mkdir build -cd build +cd .. -cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON .. -cd ../.. -ninja -C libyuv/build yuv +cmake -S libyuv -B libyuv/build -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON +cmake --build libyuv/build --target yuv --parallel diff --git a/ext/svt.cmd b/ext/svt.cmd index 872d0a82c6..db3d59ad4e 100755 --- a/ext/svt.cmd +++ b/ext/svt.cmd @@ -1,6 +1,6 @@ : # If you want to use a local build of SVT-AV1, you must clone the SVT-AV1 repo in this directory first, : # then set CMake's AVIF_CODEC_SVT to LOCAL. -: # cmake and ninja must be in your PATH. +: # cmake must be in your PATH. : # The odd choice of comment style in this file is to try to share this script between *nix and win32. diff --git a/ext/svt.sh b/ext/svt.sh index b9b4668a0b..3193a0e230 100644 --- a/ext/svt.sh +++ b/ext/svt.sh @@ -1,6 +1,6 @@ # If you want to use a local build of SVT-AV1, you must clone the SVT-AV1 repo in this directory first, # then set CMake's AVIF_CODEC_SVT to LOCAL. -# cmake and ninja must be in your PATH. +# cmake must be in your PATH. set -e diff --git a/tests/oss-fuzz/build.sh b/tests/oss-fuzz/build.sh index 32aa516c8d..da0b9e57c7 100755 --- a/tests/oss-fuzz/build.sh +++ b/tests/oss-fuzz/build.sh @@ -66,14 +66,12 @@ cd ext && bash aom.cmd && bash dav1d.cmd && bash libjpeg.cmd && bash libsharpyuv.cmd && bash libyuv.cmd && bash zlibpng.cmd && cd .. # build libavif -mkdir build -cd build EXTRA_CMAKE_FLAGS="" if [[ "$FUZZING_ENGINE" == "libfuzzer" ]]; then CXXFLAGS="${CXXFLAGS} -DFUZZTEST_COMPATIBILITY_MODE" EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS} -DFUZZTEST_COMPATIBILITY_MODE=libfuzzer" fi -cmake .. -G Ninja -DBUILD_SHARED_LIBS=OFF -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_DAV1D=LOCAL \ +cmake -S . -B build -DBUILD_SHARED_LIBS=OFF -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_DAV1D=LOCAL \ -DAVIF_CODEC_AOM_DECODE=ON -DAVIF_CODEC_AOM_ENCODE=ON \ -DAVIF_FUZZTEST=LOCAL \ -DAVIF_JPEG=LOCAL -DAVIF_LIBSHARPYUV=LOCAL \ @@ -81,7 +79,7 @@ cmake .. -G Ninja -DBUILD_SHARED_LIBS=OFF -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_DA -DAVIF_BUILD_TESTS=ON -DAVIF_GTEST=OFF -DAVIF_ENABLE_WERROR=ON \ ${EXTRA_CMAKE_FLAGS} -ninja +cmake --build build --parallel # Restrict fuzztest tests to the only compatible fuzz engine: libfuzzer. if [[ "$FUZZING_ENGINE" == "libfuzzer" ]]; then @@ -92,7 +90,7 @@ if [[ "$FUZZING_ENGINE" == "libfuzzer" ]]; then # given entrypoint as argument. # The scripts will be named: # {binary_name}@{fuzztest_entrypoint} - FUZZ_TEST_BINARIES_OUT_PATHS=$(ls ./tests/avif_fuzztest_*) + FUZZ_TEST_BINARIES_OUT_PATHS=$(ls build/tests/avif_fuzztest_*) echo "Fuzz binaries: $FUZZ_TEST_BINARIES_OUT_PATHS" for fuzz_main_file in $FUZZ_TEST_BINARIES_OUT_PATHS; do FUZZ_TESTS=$($fuzz_main_file --list_fuzz_tests | cut -d ' ' -f 4)