Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-11-09 00:27:37 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-11-09 00:27:37 +0400
commit33814e0093f0d8d5d8dca46dfc3a13a39a256227 (patch)
tree4bc801ca44b0c1d8aa75d829e3482c7eabd7b018 /intern/cycles/util
parent76f77514d3ffbb9697154bb5d12a1bee1b57b607 (diff)
edits to cycles cmake files so cmake_consistency_check.py can parse them.
Diffstat (limited to 'intern/cycles/util')
-rw-r--r--intern/cycles/util/CMakeLists.txt22
1 files changed, 14 insertions, 8 deletions
diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt
index a7f7c663509..da183aaaeb2 100644
--- a/intern/cycles/util/CMakeLists.txt
+++ b/intern/cycles/util/CMakeLists.txt
@@ -1,10 +1,11 @@
-include_directories(
+set(INC
.
${GLEW_INCLUDE_PATH}
- ${OPENGL_INCLUDE_DIR})
+ ${OPENGL_INCLUDE_DIR}
+)
-set(sources
+set(SRC
util_cache.cpp
util_cuda.cpp
util_dynlib.cpp
@@ -15,13 +16,16 @@ set(sources
util_string.cpp
util_system.cpp
util_time.cpp
- util_transform.cpp)
+ util_transform.cpp
+)
if(WITH_CYCLES_TEST)
- list(APPEND sources util_view.cpp)
+ list(APPEND SRC
+ util_view.cpp
+ )
endif()
-set(headers
+set(SRC_HEADERS
util_algorithm.h
util_args.h
util_boundbox.h
@@ -51,7 +55,9 @@ set(headers
util_types.h
util_view.h
util_vector.h
- util_xml.h)
+ util_xml.h
+)
-add_library(cycles_util ${sources} ${headers})
+include_directories(${INC})
+add_library(cycles_util ${SRC} ${SRC_HEADERS})