diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-02 13:36:44 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-02 13:50:46 +0300 |
| commit | ed935ae5adf8d676bb002380d4f46a288c6572d0 (patch) | |
| tree | 3621f6bd3988144d46d0f3d00459fbc50305d5c6 /intern/cycles/CMakeLists.txt | |
| parent | e177c5143055306d4b128663d537568bd1256645 (diff) | |
Cycles: Use lock in the memory statistics
CPU rendering is allowed to allocate memory from multiple threads,
which means statistics need to be avare of this.
Diffstat (limited to 'intern/cycles/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 7de1182282d..c8c71fe6856 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -163,6 +163,10 @@ include_directories( ${OPENEXR_INCLUDE_DIRS} ) +# TODO(sergey): Adjust so standalone repository is also happy. +include_directories( + ../atomic +) # Warnings if(CMAKE_COMPILER_IS_GNUCXX) |