aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfuzzard <fuzzard@kodi.tv>2022-01-27 10:21:31 +1000
committerfuzzard <fuzzard@kodi.tv>2022-03-02 08:57:26 +1000
commit82ce7bc87911edc99e4ee66d6a5ba00e9c32753a (patch)
treee5ec1b3b83d12c9b631e4b10affded7038c7c133
parent6992f6a41d1ecc6dcce3087493a825d90e16bb70 (diff)
[cmake] FindFmt use SETUP_BUILD_VARS macro
-rw-r--r--cmake/modules/FindFmt.cmake20
1 files changed, 6 insertions, 14 deletions
diff --git a/cmake/modules/FindFmt.cmake b/cmake/modules/FindFmt.cmake
index 1cf54dfa8f..bf574d9e9f 100644
--- a/cmake/modules/FindFmt.cmake
+++ b/cmake/modules/FindFmt.cmake
@@ -16,18 +16,9 @@ if(ENABLE_INTERNAL_FMT)
include(ExternalProject)
include(cmake/scripts/common/ModuleHelpers.cmake)
- get_archive_name(libfmt)
+ set(MODULE_LC libfmt)
- # allow user to override the download URL with a local tarball
- # needed for offline build envs
- if(FMT_URL)
- get_filename_component(FMT_URL "${FMT_URL}" ABSOLUTE)
- else()
- set(FMT_URL http://mirrors.kodi.tv/build-deps/sources/${LIBFMT_ARCHIVE})
- endif()
- if(VERBOSE)
- message(STATUS "FMT_URL: ${FMT_URL}")
- endif()
+ SETUP_BUILD_VARS()
if(APPLE)
set(EXTRA_ARGS "-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}")
@@ -35,12 +26,13 @@ if(ENABLE_INTERNAL_FMT)
set(FMT_LIBRARY ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/libfmt.a)
set(FMT_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/include)
- set(FMT_VERSION ${LIBFMT_VER})
+ set(FMT_VERSION ${${MODULE}_VER})
externalproject_add(fmt
- URL ${FMT_URL}
- URL_HASH ${LIBFMT_HASH}
+ URL ${${MODULE}_URL}
+ URL_HASH ${${MODULE}_HASH}
DOWNLOAD_DIR ${TARBALL_DIR}
+ DOWNLOAD_NAME ${${MODULE}_ARCHIVE}
PREFIX ${CORE_BUILD_DIR}/fmt
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
-DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}