mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 16:37:47 +00:00
Meta: Move UCD/CLDR/TZDB downloaded artifacts to Build/caches
They currently reside under Build/<arch>, meaning that they would be redownloaded for each architecture/toolchain build combo. Move them to a location that can be re-used for all builds.
This commit is contained in:
parent
186accb81d
commit
2334b4cebd
13 changed files with 47 additions and 43 deletions
|
@ -44,6 +44,9 @@ if(NOT SERENITY_TOOLCHAIN STREQUAL "GNU")
|
|||
endif()
|
||||
set(SERENITY_BUILD_DIR "${PROJECT_BINARY_DIR}/../${SERENITY_ARCH}${SERENITY_BUILD_DIR_SUFFIX}")
|
||||
|
||||
# Location to cache artifacts downloaded during the build.
|
||||
file(REAL_PATH "${PROJECT_BINARY_DIR}/../caches" SERENITY_CACHE_DIR)
|
||||
|
||||
# Pkgconf incorrectly discards a sysroot if it doesn't match the start of the path to the
|
||||
# library file. To avoid that, resolve our sysroot into an absolute and canonical path
|
||||
# that matches pkgconf's result for resolving the library file.
|
||||
|
@ -97,9 +100,7 @@ ExternalProject_Add(
|
|||
EXCLUDE_FROM_ALL YES
|
||||
CMAKE_CACHE_ARGS
|
||||
"-DCMAKE_INSTALL_PREFIX:STRING=<INSTALL_DIR>"
|
||||
"-DTZDB_PATH:STRING=${SERENITY_BUILD_DIR}/TZDB"
|
||||
"-DUCD_PATH:STRING=${SERENITY_BUILD_DIR}/UCD"
|
||||
"-DCLDR_PATH:STRING=${SERENITY_BUILD_DIR}/CLDR"
|
||||
"-DSERENITY_CACHE_DIR:STRING=${SERENITY_CACHE_DIR}"
|
||||
${lagom_options}
|
||||
# Always call the build step of tools, so keeping things up-to-date is easy
|
||||
BUILD_ALWAYS YES
|
||||
|
@ -126,9 +127,7 @@ ExternalProject_Add(
|
|||
# Tell the find_package(Lagom REQUIRED) command call where to find
|
||||
# the CMake package
|
||||
"-DCMAKE_PREFIX_PATH:STRING=${PROJECT_BINARY_DIR}/../lagom-install"
|
||||
"-DTZDB_PATH:STRING=${SERENITY_BUILD_DIR}/TZDB"
|
||||
"-DUCD_PATH:STRING=${SERENITY_BUILD_DIR}/UCD"
|
||||
"-DCLDR_PATH:STRING=${SERENITY_BUILD_DIR}/CLDR"
|
||||
"-DSERENITY_CACHE_DIR:STRING=${SERENITY_CACHE_DIR}"
|
||||
"-DSERENITY_ARCH:STRING=${SERENITY_ARCH}"
|
||||
"${SERENITY_TOOLCHAIN_FILE_ARG}"
|
||||
${serenity_options}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue