From 6be3f35cf1f68944ca9e4c3488c45660b2ea1c12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 May 2025 01:32:15 +0000 Subject: [PATCH 1/6] Bump lukka/get-cmake from 3.30.1 to 4.0.1 Bumps [lukka/get-cmake](https://github.com/lukka/get-cmake) from 3.30.1 to 4.0.1. - [Release notes](https://github.com/lukka/get-cmake/releases) - [Commits](https://github.com/lukka/get-cmake/compare/v3.30.1...v4.0.1) --- updated-dependencies: - dependency-name: lukka/get-cmake dependency-version: 4.0.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql.yml | 2 +- .github/workflows/compile.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index e7343bd..1cb1c65 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -36,7 +36,7 @@ jobs: config-file: ./.github/codeql/codeql-config.yml # Install CMake - - uses: lukka/get-cmake@v3.30.1 + - uses: lukka/get-cmake@v4.0.1 # Install NASM - uses: ilammy/setup-nasm@v1 diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 773cd75..7944a26 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -29,7 +29,7 @@ jobs: persist-credentials: false # Install CMake - - uses: lukka/get-cmake@v3.30.1 + - uses: lukka/get-cmake@v4.0.1 # Install NASM - uses: ilammy/setup-nasm@v1 # Launch the MSVC Tools Command Prompt (Windows) From 2c29de6a9dda343d08898d15191e789b6980b483 Mon Sep 17 00:00:00 2001 From: Timo Kokkonen Date: Thu, 11 Sep 2025 00:07:41 -0700 Subject: [PATCH 2/6] Trigger github actions. From ad977062ef0d3dfcffed2857429373a796c85408 Mon Sep 17 00:00:00 2001 From: Timo Kokkonen Date: Thu, 11 Sep 2025 00:19:55 -0700 Subject: [PATCH 3/6] Update minimum version. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 220470b..80b79fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.25) project(jpegoptim C) From 2be68acade7caa94daa68ee0a2f2263aa04c6e49 Mon Sep 17 00:00:00 2001 From: Timo Kokkonen Date: Thu, 11 Sep 2025 00:31:30 -0700 Subject: [PATCH 4/6] CMake broken version check test. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 80b79fa..59d7efb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.25) +cmake_minimum_required(VERSION 3.5) project(jpegoptim C) From 9c6d9cc51cf744262b115016e26f7bb0d643c0e7 Mon Sep 17 00:00:00 2001 From: Timo Kokkonen Date: Thu, 11 Sep 2025 00:44:17 -0700 Subject: [PATCH 5/6] update mozjpeg version --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 59d7efb..dfc4521 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.16) project(jpegoptim C) @@ -338,7 +338,7 @@ if(USE_MOZJPEG) ExternalProject_Add(mozjpeg_lib GIT_REPOSITORY https://github.com/mozilla/mozjpeg.git - GIT_TAG fd569212597dcc249752bd38ea58a4e2072da24f + GIT_TAG v4.1.1 PREFIX ${CMAKE_CURRENT_BINARY_DIR}/mozjpeg CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/mozjpeg -DPNG_SUPPORTED=0 -DWITH_TURBOJPEG=0 -DENABLE_SHARED=0 ${ARITH_FLAGS} ${MOZJPEG_EXTENDED_CMAKE_FLAGS} ) From 9e4178dd93f263fae15ba6126b727f91cf1b2575 Mon Sep 17 00:00:00 2001 From: Timo Kokkonen Date: Thu, 11 Sep 2025 00:47:07 -0700 Subject: [PATCH 6/6] add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dfc4521..607a129 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -340,7 +340,7 @@ if(USE_MOZJPEG) GIT_REPOSITORY https://github.com/mozilla/mozjpeg.git GIT_TAG v4.1.1 PREFIX ${CMAKE_CURRENT_BINARY_DIR}/mozjpeg - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/mozjpeg -DPNG_SUPPORTED=0 -DWITH_TURBOJPEG=0 -DENABLE_SHARED=0 ${ARITH_FLAGS} ${MOZJPEG_EXTENDED_CMAKE_FLAGS} + CMAKE_ARGS -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/mozjpeg -DPNG_SUPPORTED=0 -DWITH_TURBOJPEG=0 -DENABLE_SHARED=0 ${ARITH_FLAGS} ${MOZJPEG_EXTENDED_CMAKE_FLAGS} )