[cmake] change ARCHIVE to LIBNAME_ARCHIVE

Findlibdvd does 3 dependencies in the single find module. Facilitate this by
setting ARCHIVE to be LIBNAME_ARCHIVE instead to allow differentiation for multiple
calls in the single Find module.

10 files changed, 12 insertions, 12 deletions

diff --git a/cmake/modules/FindCrossGUID.cmake b/cmake/modules/FindCrossGUID.cmake
index 01ec1a05f9..b598f5b577 100644
--- a/cmake/modules/FindCrossGUID.cmake
+++ b/cmake/modules/FindCrossGUID.cmake
@@ -9,7 +9,7 @@ if(ENABLE_INTERNAL_CROSSGUID)
   if(CROSSGUID_URL)
     get_filename_component(CROSSGUID_URL "${CROSSGUID_URL}" ABSOLUTE)
   else()
-    set(CROSSGUID_URL http://mirrors.kodi.tv/build-deps/sources/${ARCHIVE})
+    set(CROSSGUID_URL http://mirrors.kodi.tv/build-deps/sources/${CROSSGUID_ARCHIVE})
   endif()
   if(VERBOSE)
     message(STATUS "CROSSGUID_URL: ${CROSSGUID_URL}")
diff --git a/cmake/modules/FindDav1d.cmake b/cmake/modules/FindDav1d.cmake
index a5a21b12e5..69aba58296 100644
--- a/cmake/modules/FindDav1d.cmake
+++ b/cmake/modules/FindDav1d.cmake
@@ -33,7 +33,7 @@ if(ENABLE_INTERNAL_DAV1D)
   if(DAV1D_URL)
     get_filename_component(DAV1D_URL "${DAV1D_URL}" ABSOLUTE)
   else()
-    set(DAV1D_URL http://mirrors.kodi.tv/build-deps/sources/${ARCHIVE})
+    set(DAV1D_URL http://mirrors.kodi.tv/build-deps/sources/${DAV1D_ARCHIVE})
   endif()
 
   if(VERBOSE)
@@ -46,7 +46,7 @@ if(ENABLE_INTERNAL_DAV1D)
 
   externalproject_add(dav1d
                       URL ${DAV1D_URL}
-                      DOWNLOAD_NAME ${ARCHIVE}
+                      DOWNLOAD_NAME ${DAV1D_ARCHIVE}
                       DOWNLOAD_DIR ${TARBALL_DIR}
                       PREFIX ${CORE_BUILD_DIR}/dav1d
                       CONFIGURE_COMMAND meson
diff --git a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake
index be77c51024..827753caf5 100644
--- a/cmake/modules/FindFFMPEG.cmake
+++ b/cmake/modules/FindFFMPEG.cmake
@@ -250,7 +250,7 @@ if(NOT FFMPEG_FOUND)
 
   externalproject_add(ffmpeg
                       URL ${FFMPEG_URL}
-                      DOWNLOAD_NAME ${ARCHIVE}
+                      DOWNLOAD_NAME ${FFMPEG_ARCHIVE}
                       DOWNLOAD_DIR ${TARBALL_DIR}
                       PREFIX ${CORE_BUILD_DIR}/ffmpeg
                       CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
diff --git a/cmake/modules/FindFlatBuffers.cmake b/cmake/modules/FindFlatBuffers.cmake
index 4d7a9ba331..07d99d8914 100644
--- a/cmake/modules/FindFlatBuffers.cmake
+++ b/cmake/modules/FindFlatBuffers.cmake
@@ -20,7 +20,7 @@ if(ENABLE_INTERNAL_FLATBUFFERS)
   if(FLATBUFFERS_URL)
     get_filename_component(FLATBUFFERS_URL "${FLATBUFFERS_URL}" ABSOLUTE)
   else()
-    set(FLATBUFFERS_URL http://mirrors.kodi.tv/build-deps/sources/${ARCHIVE})
+    set(FLATBUFFERS_URL http://mirrors.kodi.tv/build-deps/sources/${FLATBUFFERS_ARCHIVE})
   endif()
   if(VERBOSE)
     message(STATUS "FLATBUFFERS_URL: ${FLATBUFFERS_URL}")
diff --git a/cmake/modules/FindFmt.cmake b/cmake/modules/FindFmt.cmake
index d3d66820f8..b8614da9a1 100644
--- a/cmake/modules/FindFmt.cmake
+++ b/cmake/modules/FindFmt.cmake
@@ -23,7 +23,7 @@ if(ENABLE_INTERNAL_FMT)
   if(FMT_URL)
       get_filename_component(FMT_URL "${FMT_URL}" ABSOLUTE)
   else()
-    set(FMT_URL http://mirrors.kodi.tv/build-deps/sources/${ARCHIVE})
+    set(FMT_URL http://mirrors.kodi.tv/build-deps/sources/${FMT_ARCHIVE})
   endif()
   if(VERBOSE)
       message(STATUS "FMT_URL: ${FMT_URL}")
diff --git a/cmake/modules/FindFstrcmp.cmake b/cmake/modules/FindFstrcmp.cmake
index 038331bf5c..cdfd292f30 100644
--- a/cmake/modules/FindFstrcmp.cmake
+++ b/cmake/modules/FindFstrcmp.cmake
@@ -22,7 +22,7 @@ if(ENABLE_INTERNAL_FSTRCMP)
   if(FSTRCMP_URL)
     get_filename_component(FSTRCMP_URL "${FSTRCMP_URL}" ABSOLUTE)
   else()
-    set(FSTRCMP_URL http://mirrors.kodi.tv/build-deps/sources/${ARCHIVE})
+    set(FSTRCMP_URL http://mirrors.kodi.tv/build-deps/sources/${FSTRCMP_ARCHIVE})
   endif()
   if(VERBOSE)
     message(STATUS "FSTRCMPURL: ${FSTRCMP_URL}")
diff --git a/cmake/modules/FindGtest.cmake b/cmake/modules/FindGtest.cmake
index f2b7e9fe8a..76c201cf1b 100644
--- a/cmake/modules/FindGtest.cmake
+++ b/cmake/modules/FindGtest.cmake
@@ -26,7 +26,7 @@ if(ENABLE_INTERNAL_GTEST)
   if(GTEST_URL)
     get_filename_component(GTEST_URL "${GTEST_URL}" ABSOLUTE)
   else()
-    set(GTEST_URL http://mirrors.kodi.tv/build-deps/sources/${ARCHIVE})
+    set(GTEST_URL http://mirrors.kodi.tv/build-deps/sources/${GTEST_ARCHIVE})
   endif()
 
   if(VERBOSE)
diff --git a/cmake/modules/FindRapidJSON.cmake b/cmake/modules/FindRapidJSON.cmake
index 699d325d19..8bf7fe1ac8 100644
--- a/cmake/modules/FindRapidJSON.cmake
+++ b/cmake/modules/FindRapidJSON.cmake
@@ -19,7 +19,7 @@ if(ENABLE_INTERNAL_RapidJSON)
   if(RapidJSON_URL)
     get_filename_component(RapidJSON_URL "${RapidJSON_URL}" ABSOLUTE)
   else()
-    set(RapidJSON_URL http://mirrors.kodi.tv/build-deps/sources/${ARCHIVE})
+    set(RapidJSON_URL http://mirrors.kodi.tv/build-deps/sources/${RAPIDJSON_ARCHIVE})
   endif()
   if(VERBOSE)
     message(STATUS "RapidJSON_URL: ${RapidJSON_URL}")
diff --git a/cmake/modules/FindSpdlog.cmake b/cmake/modules/FindSpdlog.cmake
index aa57d87a78..03a1aaec71 100644
--- a/cmake/modules/FindSpdlog.cmake
+++ b/cmake/modules/FindSpdlog.cmake
@@ -25,7 +25,7 @@ if(ENABLE_INTERNAL_SPDLOG)
   if(SPDLOG_URL)
       get_filename_component(SPDLOG_URL "${SPDLOG_URL}" ABSOLUTE)
   else()
-      set(SPDLOG_URL http://mirrors.kodi.tv/build-deps/sources/${ARCHIVE})
+      set(SPDLOG_URL http://mirrors.kodi.tv/build-deps/sources/${SPDLOG_ARCHIVE})
   endif()
   if(VERBOSE)
       message(STATUS "SPDLOG_URL: ${SPDLOG_URL}")
diff --git a/cmake/modules/FindUdfread.cmake b/cmake/modules/FindUdfread.cmake
index 0223a190fc..85c7bf0f0c 100644
--- a/cmake/modules/FindUdfread.cmake
+++ b/cmake/modules/FindUdfread.cmake
@@ -33,7 +33,7 @@ if(ENABLE_INTERNAL_UDFREAD)
   if(UDFREAD_URL)
     get_filename_component(UDFREAD_URL "${UDFREAD_URL}" ABSOLUTE)
   else()
-    set(UDFREAD_URL http://mirrors.kodi.tv/build-deps/sources/${ARCHIVE})
+    set(UDFREAD_URL http://mirrors.kodi.tv/build-deps/sources/${UDFREAD_ARCHIVE})
   endif()
 
   if(VERBOSE)
@@ -46,7 +46,7 @@ if(ENABLE_INTERNAL_UDFREAD)
 
   externalproject_add(udfread
                       URL ${UDFREAD_URL}
-                      DOWNLOAD_NAME libudfread-${UDFREAD_VER}.tar.gz
+                      DOWNLOAD_NAME ${UDFREAD_ARCHIVE}
                       DOWNLOAD_DIR ${TARBALL_DIR}
                       PREFIX ${CORE_BUILD_DIR}/libudfread
                       CONFIGURE_COMMAND autoreconf -vif &&