diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-16 21:03:59 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-17 22:39:16 +0300 |
| commit | 2b73402547a7c765f302a0d4218f96b5a710e96f (patch) | |
| tree | 354c809906e468904391be1f6463cd678f13e95d /intern/cycles/CMakeLists.txt | |
| parent | 0e8cd14dfee9788f24854aa8f4148033ef042f51 (diff) | |
Fix C++11 build issues on OS X, remove references to outdated libs.
Diffstat (limited to 'intern/cycles/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 3b6c25c370e..efc36f0e6b8 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -153,7 +153,9 @@ set(WITH_CYCLES_DEVICE_MULTI TRUE) if(CYCLES_STANDALONE_REPOSITORY) TEST_UNORDERED_MAP_SUPPORT() endif() -if(HAVE_STD_UNORDERED_MAP_HEADER) +if(WITH_CXX11) + add_definitions(-DCYCLES_STD_UNORDERED_MAP) +elseif(HAVE_STD_UNORDERED_MAP_HEADER) if(HAVE_UNORDERED_MAP_IN_STD_NAMESPACE) add_definitions(-DCYCLES_STD_UNORDERED_MAP) else() |