diff options
| author | Peter Klimenko <peterklimk@outlook.com> | 2020-07-31 11:45:15 +0300 |
|---|---|---|
| committer | Peter Klimenko <peterklimk@outlook.com> | 2020-07-31 11:45:15 +0300 |
| commit | 97a4a8d0fb7fd9ac34f9f5d4d5a0689c01235e14 (patch) | |
| tree | fc9746d2210eda08be9d44ae67d5e58d64b48b40 /intern/cycles/kernel/osl/CMakeLists.txt | |
| parent | 4a7c203e9ecc7c5b0370afc0fdd6bcc183dc00df (diff) | |
| parent | f3e8326453ae856d7914e45e832a2ed80aa9a9b9 (diff) | |
merge
Diffstat (limited to 'intern/cycles/kernel/osl/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/kernel/osl/CMakeLists.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/intern/cycles/kernel/osl/CMakeLists.txt b/intern/cycles/kernel/osl/CMakeLists.txt index fc0c845fd4f..d7ab778181e 100644 --- a/intern/cycles/kernel/osl/CMakeLists.txt +++ b/intern/cycles/kernel/osl/CMakeLists.txt @@ -36,6 +36,15 @@ set(LIB # OSL and LLVM are built without RTTI set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}") +if(APPLE) + # Disable allocation warning on macOS prior to 10.14: the OSLRenderServices + # contains member which is 64 bytes aligned (cache inside of OIIO's + # unordered_map_concurrent). This is not something what the SDK supportsm, but + # since we take care of allocations ourselves is is OK to ignore the + # diagnostic message. + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -faligned-allocation") +endif() + include_directories(${INC}) include_directories(SYSTEM ${INC_SYS}) |