diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-08-24 07:17:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-24 07:17:28 +0400 |
| commit | b97334f9921eec17527b56526c66e7e27a097525 (patch) | |
| tree | 4fef290e271fc16d29095367c4ae8a1d82866f37 /intern | |
| parent | b44f3bf1ab593b89f66b126e0d887f8b7813a30a (diff) | |
add GPL header to treehash.c and add missing includes to cmake.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/guardedalloc/CMakeLists.txt | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt index bb8cd7aaf70..69d6e253fd0 100644 --- a/intern/CMakeLists.txt +++ b/intern/CMakeLists.txt @@ -23,6 +23,7 @@ # # ***** END GPL LICENSE BLOCK ***** +# add_subdirectory(atomic) # header only add_subdirectory(string) add_subdirectory(ghost) add_subdirectory(guardedalloc) diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 963ec652784..40cae22ed97 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -22,6 +22,7 @@ set(SRC_HEADERS kernel.h kernel_accumulate.h kernel_bvh.h + kernel_bvh_subsurface.h kernel_bvh_traversal.h kernel_camera.h kernel_compat_cpu.h diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt index 7ac978b0edd..1e140c5b674 100644 --- a/intern/guardedalloc/CMakeLists.txt +++ b/intern/guardedalloc/CMakeLists.txt @@ -36,6 +36,9 @@ set(SRC ./intern/mallocn.c MEM_guardedalloc.h + + # include here since its a header-only + ../atomic/atomic_ops.h ) if(WIN32 AND NOT UNIX) |