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) diff --git a/CMakeLists.txt b/CMakeLists.txt index 220470b..607a129 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.16) project(jpegoptim C) @@ -338,9 +338,9 @@ 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} + 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} )