diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2021-04-13 18:47:48 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2021-04-13 18:47:48 +0300 |
| commit | b8479a70c936c5c59f199a847d679c80196e6c0b (patch) | |
| tree | 99da410b2af92039d585913be31d0e50c055220b /build_files/build_environment | |
| parent | 1f2a801044ac77a5371fbea3bdc2cf3c4258954f (diff) | |
Add `make source_archive_complete` target
Add a `source_archive_complete` target for `make` that creates a source
archive including the source packages of Blender's dependencies.
This expands `make_source_archive.py` to include files from
`${BUILD_DIR}/source_archive/packages/` as well.
Reviewed By: dfelinto
Maniphest Tasks: T86124
Differential Revision: https://developer.blender.org/D10727
Diffstat (limited to 'build_files/build_environment')
| -rw-r--r-- | build_files/build_environment/cmake/options.cmake | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake index 15ceb693ae0..486b3d1a802 100644 --- a/build_files/build_environment/cmake/options.cmake +++ b/build_files/build_environment/cmake/options.cmake @@ -37,14 +37,8 @@ else(BUILD_MODE STREQUAL "Debug") endif() set(DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/downloads" CACHE STRING "Path for downloaded files") -# look in blenders source folder for packages directory, if that exists -# it will our package folder, otherwise it will be in the build folder -if(EXISTS "${CMAKE_SOURCE_DIR}/../../packages") - set(PACKAGE_DIR_DEFAULT "${CMAKE_SOURCE_DIR}/../../packages") -else() - set(PACKAGE_DIR_DEFAULT "${CMAKE_CURRENT_BINARY_DIR}/packages") -endif() -set(PACKAGE_DIR ${PACKAGE_DIR_DEFAULT} CACHE STRING "Path for downloaded source 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") option(PACKAGE_USE_UPSTREAM_SOURCES "Use soures upstream to download the package sources, when OFF the blender mirror will be used" ON) file(TO_CMAKE_PATH ${DOWNLOAD_DIR} DOWNLOAD_DIR) |