[Bf-blender-cvs] [8df6769] master: CMake: update source files
Campbell Barton
noreply at git.blender.org
Sat Jun 28 15:18:30 CEST 2014
Commit: 8df676904069a71496515117669f54751a36092d
Author: Campbell Barton
Date: Sat Jun 28 22:53:43 2014 +1000
https://developer.blender.org/rB8df676904069a71496515117669f54751a36092d
CMake: update source files
===================================================================
M intern/cycles/kernel/CMakeLists.txt
M source/blender/blenlib/CMakeLists.txt
M tests/gtests/blenlib/CMakeLists.txt
M tests/gtests/bmesh/CMakeLists.txt
M tests/gtests/guardedalloc/CMakeLists.txt
M tests/gtests/testing/CMakeLists.txt
===================================================================
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index 58142ee..281dc41 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -113,6 +113,7 @@ set(SRC_GEOM_HEADERS
geom/geom.h
geom/geom_attribute.h
geom/geom_bvh.h
+ geom/geom_bvh_shadow.h
geom/geom_bvh_subsurface.h
geom/geom_bvh_traversal.h
geom/geom_curve.h
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 9e36074..0c1c5f1 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -164,6 +164,7 @@ set(SRC
BLI_sort.h
BLI_sort_utils.h
BLI_stack.h
+ BLI_stackdefines.h
BLI_strict_flags.h
BLI_string.h
BLI_string_cursor_utf8.h
diff --git a/tests/gtests/blenlib/CMakeLists.txt b/tests/gtests/blenlib/CMakeLists.txt
index 4980ca2..45bbcbd 100644
--- a/tests/gtests/blenlib/CMakeLists.txt
+++ b/tests/gtests/blenlib/CMakeLists.txt
@@ -23,7 +23,7 @@
set(INC
.
- ../
+ ..
../../../source/blender/blenlib
../../../intern/guardedalloc
)
diff --git a/tests/gtests/bmesh/CMakeLists.txt b/tests/gtests/bmesh/CMakeLists.txt
index b1166a6..b62141e 100644
--- a/tests/gtests/bmesh/CMakeLists.txt
+++ b/tests/gtests/bmesh/CMakeLists.txt
@@ -23,7 +23,7 @@
set(INC
.
- ../
+ ..
../../../source/blender/blenlib
../../../source/blender/makesdna
../../../source/blender/bmesh
diff --git a/tests/gtests/guardedalloc/CMakeLists.txt b/tests/gtests/guardedalloc/CMakeLists.txt
index c09f872..394bc0b 100644
--- a/tests/gtests/guardedalloc/CMakeLists.txt
+++ b/tests/gtests/guardedalloc/CMakeLists.txt
@@ -23,7 +23,7 @@
set(INC
.
- ../
+ ..
../../../intern/guardedalloc
)
diff --git a/tests/gtests/testing/CMakeLists.txt b/tests/gtests/testing/CMakeLists.txt
index 93a3049..0e5da49 100644
--- a/tests/gtests/testing/CMakeLists.txt
+++ b/tests/gtests/testing/CMakeLists.txt
@@ -23,7 +23,7 @@
set(INC
.
- ../
+ ..
../../../extern/libmv/third_party/gflags
../../../extern/gtest/include
)
@@ -43,6 +43,8 @@ set(INC_SYS
set(SRC
testing_main.cc
+
+ testing.h
)
blender_add_lib(bf_testing_main "${SRC}" "${INC}" "${INC_SYS}")
More information about the Bf-blender-cvs
mailing list