diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-10-02 07:18:48 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-02 07:18:48 +0400 |
commit | dc8340fa331164b78ba3414a67ec625bc80d30b6 (patch) | |
tree | 024bba18688348b6b88f8acb00322f2ed21355bd /intern | |
parent | 959dc02f96b9366b3a73acf918ca0360c55d387f (diff) |
correct some include dirs not being included as SYSTEM paths in cmake.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/bsp/CMakeLists.txt | 2 | ||||
-rw-r--r-- | intern/cycles/render/CMakeLists.txt | 1 | ||||
-rw-r--r-- | intern/opencolorio/CMakeLists.txt | 32 |
3 files changed, 19 insertions, 16 deletions
diff --git a/intern/bsp/CMakeLists.txt b/intern/bsp/CMakeLists.txt index e492c04423e..136c168bdb8 100644 --- a/intern/bsp/CMakeLists.txt +++ b/intern/bsp/CMakeLists.txt @@ -62,7 +62,7 @@ if(WITH_BOOST) -DCARVE_SYSTEM_BOOST ) - list(APPEND INC + list(APPEND INC_SYS ${BOOST_INCLUDE_DIR} ) endif() diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt index 6b8e3702d03..e75a3b37f3b 100644 --- a/intern/cycles/render/CMakeLists.txt +++ b/intern/cycles/render/CMakeLists.txt @@ -7,7 +7,6 @@ set(INC ../kernel/osl ../bvh ../util - ${GLEW_INCLUDE_PATH} ) set(INC_SYS ${GLEW_INCLUDE_PATH} 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( ) |