From 4b6c298b419a0b0fb518f9102b42b434d38945ab Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Sun, 2 Jun 2024 21:30:27 +0200 Subject: [PATCH] Fix handling of Mirror list --- .gitea/workflows/build_pc.yml | 2 +- 3rdParty/libarchive/ext/CMakeLists.txt | 8 ++++---- 3rdParty/libjpeg-turbo/ext/CMakeLists.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build_pc.yml b/.gitea/workflows/build_pc.yml index 69b08c1..ee12a79 100644 --- a/.gitea/workflows/build_pc.yml +++ b/.gitea/workflows/build_pc.yml @@ -45,7 +45,7 @@ jobs: if: matrix.config.os == 'ubuntu-latest' run: sudo apt update && sudo apt install -y extra-cmake-modules libwayland-dev libxkbcommon-dev xorg-dev libarchive-dev libassimp-dev ninja-build - name: Configure CMake - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DDEPENDENCY_MIRROR_FILE=${{github.workspace}}/workflows/DependencyMirrors.txt + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DDEPENDENCY_MIRROR_FILE="${{github.workspace}}/.gitea/workflows/DependencyMirrors.txt" - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - name: Test diff --git a/3rdParty/libarchive/ext/CMakeLists.txt b/3rdParty/libarchive/ext/CMakeLists.txt index bcdb3f5..0150d5d 100644 --- a/3rdParty/libarchive/ext/CMakeLists.txt +++ b/3rdParty/libarchive/ext/CMakeLists.txt @@ -2,16 +2,16 @@ cmake_minimum_required(VERSION 3.16) project(build_libarchive) include(ExternalProject) -if(NOT DEFINED ZLIB_REPO) +if(NOT DEFINED ZLIB_REPO OR ZLIB_REPO STREQUAL "") set(ZLIB_REPO https://github.com/madler/zlib.git) endif () -if(NOT DEFINED ZSTD_REPO) +if(NOT DEFINED ZSTD_REPO OR ZSTD_REPO STREQUAL "") set(ZSTD_REPO https://github.com/facebook/zstd) endif () -if(NOT DEFINED LZ4_REPO) +if(NOT DEFINED LZ4_REPO OR LZ4_REPO STREQUAL "") set(LZ4_REPO https://github.com/lz4/lz4) endif () -if(NOT DEFINED LIBARCHIVE_REPO) +if(NOT DEFINED LIBARCHIVE_REPO OR LIBARCHIVE_REPO STREQUAL "") set(LIBARCHIVE_REPO https://github.com/libarchive/libarchive.git) endif () diff --git a/3rdParty/libjpeg-turbo/ext/CMakeLists.txt b/3rdParty/libjpeg-turbo/ext/CMakeLists.txt index 792314a..d9cca02 100644 --- a/3rdParty/libjpeg-turbo/ext/CMakeLists.txt +++ b/3rdParty/libjpeg-turbo/ext/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16) project(build_libjpeg-turbo) include(ExternalProject) -if(NOT DEFINED LIBJPEGTURBO_REPO) +if(NOT DEFINED LIBJPEGTURBO_REPO OR LIBJPEGTURBO_REPO STREQUAL "") set(LIBJPEGTURBO_REPO https://github.com/libjpeg-turbo/libjpeg-turbo.git) endif ()