diff options
author | Sebastián Barschkis <sebbas@sebbas.org> | 2021-02-26 19:37:51 +0300 |
---|---|---|
committer | Sebastián Barschkis <sebbas@sebbas.org> | 2021-02-26 19:38:14 +0300 |
commit | fb7751f3e6c3cc5295c1eb4004e2125ffd4e08de (patch) | |
tree | e247080d315bc03ade1d0d6c57165ffde74cd5d0 /build_files/build_environment/cmake/osl.cmake | |
parent | cd388ef2f11d85ac6fc5382cab18e33cd0bd5a59 (diff) |
CMake/deps: Fix LLVM and OSL builds
This commit is addition to D10212. Apple arm64 support was left out in that patch.
Diffstat (limited to 'build_files/build_environment/cmake/osl.cmake')
-rw-r--r-- | build_files/build_environment/cmake/osl.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/osl.cmake b/build_files/build_environment/cmake/osl.cmake index 78930182f2b..0628130134b 100644 --- a/build_files/build_environment/cmake/osl.cmake +++ b/build_files/build_environment/cmake/osl.cmake @@ -71,6 +71,11 @@ set(OSL_EXTRA_ARGS -DUSE_PYTHON=OFF ) +# Apple arm64 uses LLVM 11, LLVM 10+ requires C++14 +if (APPLE AND "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64") + list(APPEND OSL_EXTRA_ARGS -DCMAKE_CXX_STANDARD=14) +endif() + ExternalProject_Add(external_osl URL ${OSL_URI} DOWNLOAD_DIR ${DOWNLOAD_DIR} |