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:
authorJoerg Mueller <nexyon@gmail.com>2011-06-04 03:24:01 +0400
committerJoerg Mueller <nexyon@gmail.com>2011-06-04 03:24:01 +0400
commitcd04cff1800e8f60a06d8da6e79ac436808c9a7d (patch)
tree8c6aa631dab983e845ff8626725537d8b71dc9e4 /source/blender/collada/CMakeLists.txt
parent71419c46471586e93884aa151f5b160863025886 (diff)
parentd84c6a3cdb60c4e31db75efc4c6f9a3ea9e9f034 (diff)
Merge with trunk revision 37149.
Diffstat (limited to 'source/blender/collada/CMakeLists.txt')
-rw-r--r--source/blender/collada/CMakeLists.txt10
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt
index 130e18f4c9a..7c43c09bc12 100644
--- a/source/blender/collada/CMakeLists.txt
+++ b/source/blender/collada/CMakeLists.txt
@@ -38,8 +38,12 @@ set(INC
../../../intern/guardedalloc
)
+set(INC_SYS
+
+)
+
if(APPLE)
- list(APPEND INC
+ list(APPEND INC_SYS
${OPENCOLLADA_INC}/COLLADAStreamWriter
${OPENCOLLADA_INC}/COLLADABaseUtils
${OPENCOLLADA_INC}/COLLADAFramework
@@ -47,7 +51,7 @@ if(APPLE)
${OPENCOLLADA_INC}/GeneratedSaxParser
)
else()
- list(APPEND INC
+ list(APPEND INC_SYS
${OPENCOLLADA_INC}/COLLADAStreamWriter/include
${OPENCOLLADA_INC}/COLLADABaseUtils/include
${OPENCOLLADA_INC}/COLLADAFramework/include
@@ -113,4 +117,4 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
endif()
-blender_add_lib(bf_collada "${SRC}" "${INC}")
+blender_add_lib(bf_collada "${SRC}" "${INC}" "${INC_SYS}")