From ed935ae5adf8d676bb002380d4f46a288c6572d0 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 2 Dec 2014 15:36:44 +0500 Subject: 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. --- intern/cycles/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'intern/cycles/CMakeLists.txt') 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) -- cgit v1.2.3