From 14c218b3fd9e936423a5bc3269063aca76f61681 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Tue, 25 Oct 2022 17:00:48 -0600 Subject: deps_builder: fix hardcoded path the windows builder has 2 different build folders for the debug and release libs, hardcoding the path like this leads to an extra 1GB of downloaded files. The windows builder supplies a single PACKAGE_DIR for both but gets ignored. This change promotes PACKAGE_DIR to be cached in CMakeCache so it can be changed if needed. Differential Revision: https://developer.blender.org/D16213 Reviewed by; brecht, dfelinto --- build_files/build_environment/cmake/options.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake index 9058e945f6d..13e7fb58be2 100644 --- a/build_files/build_environment/cmake/options.cmake +++ b/build_files/build_environment/cmake/options.cmake @@ -21,8 +21,8 @@ else() endif() set(DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/downloads" CACHE STRING "Path for downloaded files") -# This path must be hard-coded like this, so that the GNUmakefile knows where it is and can pass it to make_source_archive.py: -set(PACKAGE_DIR "${CMAKE_CURRENT_BINARY_DIR}/packages") + +set(PACKAGE_DIR "${CMAKE_CURRENT_BINARY_DIR}/packages" CACHE PATH "default path for downloaded packages") option(PACKAGE_USE_UPSTREAM_SOURCES "Use sources upstream to download the package sources, when OFF the blender mirror will be used" ON) file(TO_CMAKE_PATH ${DOWNLOAD_DIR} DOWNLOAD_DIR) -- cgit v1.2.3