diff options
| author | Patrick Mours <pmours@nvidia.com> | 2022-06-30 17:44:38 +0300 |
|---|---|---|
| committer | Patrick Mours <pmours@nvidia.com> | 2022-06-30 17:49:42 +0300 |
| commit | ef268c78933079137288e326704431432adf9ad9 (patch) | |
| tree | 3f52751f8df6a5bd0fa86d5df75ffd68fd080363 /build_files/build_environment/CMakeLists.txt | |
| parent | f00d9e80aec70c804747f9340bdf0e2fc0e94942 (diff) | |
Build: Fix build of library dependencies on Linux aarch64
rBb9c37608a9e959a896f5358d4ab3d3d001a70833 moved evaluation of
`versions.cmake` before `options.cmake`, as a result of which
`BLENDER_PLATFORM_ARM` was no longer defined in `versions.cmake`,
causing it to choose the wrong OpenSSL version for aarch64. This
reverts that. Also fixes a compiler crash when building flex with some
glibc versions.
Differential Revision: https://developer.blender.org/D15319
Diffstat (limited to 'build_files/build_environment/CMakeLists.txt')
| -rw-r--r-- | build_files/build_environment/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt index a9ff48b2a9b..e0350901cd0 100644 --- a/build_files/build_environment/CMakeLists.txt +++ b/build_files/build_environment/CMakeLists.txt @@ -29,8 +29,9 @@ cmake_minimum_required(VERSION 3.5) include(ExternalProject) include(cmake/check_software.cmake) -include(cmake/versions.cmake) include(cmake/options.cmake) +# versions.cmake needs to be included after options.cmake due to the BLENDER_PLATFORM_ARM variable being needed. +include(cmake/versions.cmake) include(cmake/boost_build_options.cmake) include(cmake/download.cmake) include(cmake/macros.cmake) |