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>2012-10-02 07:18:48 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-10-02 07:18:48 +0400
commitdc8340fa331164b78ba3414a67ec625bc80d30b6 (patch)
tree024bba18688348b6b88f8acb00322f2ed21355bd /intern/opencolorio
parent959dc02f96b9366b3a73acf918ca0360c55d387f (diff)
correct some include dirs not being included as SYSTEM paths in cmake.
Diffstat (limited to 'intern/opencolorio')
-rw-r--r--intern/opencolorio/CMakeLists.txt32
1 files changed, 18 insertions, 14 deletions
diff --git a/intern/opencolorio/CMakeLists.txt b/intern/opencolorio/CMakeLists.txt
index 479bbd3ab0a..9f5d4cd332c 100644
--- a/intern/opencolorio/CMakeLists.txt
+++ b/intern/opencolorio/CMakeLists.txt
@@ -23,25 +23,33 @@
#
# ***** END GPL LICENSE BLOCK *****
+set(INC
+ .
+ ../guardedalloc
+)
+
+set(INC_SYS
+)
+
+
if(WITH_OPENCOLORIO)
- set(INC
- .
- ${OPENCOLORIO_INCLUDE_DIRS}
- )
- set(SRC
- ocio_capi.cpp
- ocio_capi.h
+ list(APPEND INC_SYS
+ ${OPENCOLORIO_INCLUDE_DIRS}
)
if(WIN32 AND NOT MINGW)
- list(APPEND INC
+ list(APPEND INC_SYS
${BOOST_INCLUDE_DIR}
)
endif()
+
+ set(SRC
+ ocio_capi.cpp
+ ocio_capi.h
+ )
else()
- set(INC
- .
+ list(APPEND INC
../../source/blender/blenlib
)
@@ -51,10 +59,6 @@ else()
)
endif()
-set(INC_SYS
- ../guardedalloc
-)
-
add_definitions(
)