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
path: root/intern
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-09-20 13:04:43 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-09-20 13:04:43 +0400
commitb0c7c8756f0f7c7e54bf1028b80826f4f1429737 (patch)
tree27839e8d6a38909d4c9bdb9ea63d4b1b07bbb015 /intern
parentff834242b76240ab0004d830813892488ec4865c (diff)
code cleanup: cycles now uses system includes for boost/oiio.. etc, so we dont get warnings from system headers.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/CMakeLists.txt1
-rw-r--r--intern/cycles/app/CMakeLists.txt3
-rw-r--r--intern/cycles/bvh/CMakeLists.txt3
-rw-r--r--intern/cycles/device/CMakeLists.txt3
-rw-r--r--intern/cycles/kernel/CMakeLists.txt3
-rw-r--r--intern/cycles/kernel/osl/CMakeLists.txt3
-rw-r--r--intern/cycles/render/CMakeLists.txt4
-rw-r--r--intern/cycles/subd/CMakeLists.txt3
-rw-r--r--intern/cycles/util/CMakeLists.txt3
9 files changed, 26 insertions, 0 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index 337eebe4be0..90eeb4b4758 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -56,6 +56,7 @@ add_definitions(-DWITH_CUDA)
add_definitions(-DWITH_MULTI)
include_directories(
+ SYSTEM
${BOOST_INCLUDE_DIR}
${OPENIMAGEIO_INCLUDE_DIRS}
${OPENIMAGEIO_INCLUDE_DIRS}/OpenImageIO)
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt
index 2e2897d0443..83b3f731ffe 100644
--- a/intern/cycles/app/CMakeLists.txt
+++ b/intern/cycles/app/CMakeLists.txt
@@ -9,6 +9,8 @@ set(INC
../render
../subd
)
+set(INC_SYS
+)
set(LIBRARIES
cycles_device
@@ -38,6 +40,7 @@ if(WITH_CYCLES_PARTIO)
endif()
include_directories(${INC})
+include_directories(SYSTEM ${INC_SYS})
if(WITH_CYCLES_TEST)
set(SRC
diff --git a/intern/cycles/bvh/CMakeLists.txt b/intern/cycles/bvh/CMakeLists.txt
index 131a7a1f750..ba5c3785eac 100644
--- a/intern/cycles/bvh/CMakeLists.txt
+++ b/intern/cycles/bvh/CMakeLists.txt
@@ -7,6 +7,8 @@ set(INC
../util
../device
)
+set(INC_SYS
+)
set(SRC
bvh.cpp
@@ -28,5 +30,6 @@ set(SRC_HEADERS
)
include_directories(${INC})
+include_directories(SYSTEM ${INC_SYS})
add_library(cycles_bvh ${SRC} ${SRC_HEADERS})
diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt
index 6038abd815e..1d7c6ef4be3 100644
--- a/intern/cycles/device/CMakeLists.txt
+++ b/intern/cycles/device/CMakeLists.txt
@@ -6,6 +6,8 @@ set(INC
../kernel/osl
../util
../render
+)
+set(INC_SYS
${OPENGL_INCLUDE_DIR}
${GLEW_INCLUDE_PATH}
)
@@ -31,5 +33,6 @@ set(SRC_HEADERS
add_definitions(-DGLEW_STATIC)
include_directories(${INC})
+include_directories(SYSTEM ${INC_SYS})
add_library(cycles_device ${SRC} ${SRC_HEADERS})
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index b43aca24496..df8a9b1d5b4 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -5,6 +5,8 @@ set(INC
osl
svm
)
+set(INC_SYS
+)
set(SRC
kernel.cpp
@@ -135,6 +137,7 @@ endif()
# CPU module
include_directories(${INC})
+include_directories(SYSTEM ${INC_SYS})
add_library(cycles_kernel ${SRC} ${SRC_HEADERS} ${SRC_SVM_HEADERS})
diff --git a/intern/cycles/kernel/osl/CMakeLists.txt b/intern/cycles/kernel/osl/CMakeLists.txt
index d4ea8b12f5a..65d7a7ad53b 100644
--- a/intern/cycles/kernel/osl/CMakeLists.txt
+++ b/intern/cycles/kernel/osl/CMakeLists.txt
@@ -7,6 +7,8 @@ set(INC
../../util
../../device
)
+set(INC_SYS
+)
set(SRC
background.cpp
@@ -39,6 +41,7 @@ set(HEADER_SRC
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
include_directories(${INC})
+include_directories(SYSTEM ${INC_SYS})
add_library(cycles_kernel_osl ${SRC} ${HEADER_SRC})
diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt
index 85b476e60d9..6b8e3702d03 100644
--- a/intern/cycles/render/CMakeLists.txt
+++ b/intern/cycles/render/CMakeLists.txt
@@ -9,6 +9,9 @@ set(INC
../util
${GLEW_INCLUDE_PATH}
)
+set(INC_SYS
+ ${GLEW_INCLUDE_PATH}
+)
set(SRC
attribute.cpp
@@ -64,6 +67,7 @@ set(SRC_HEADERS
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
include_directories(${INC})
+include_directories(SYSTEM ${INC_SYS})
add_library(cycles_render ${SRC} ${SRC_HEADERS})
diff --git a/intern/cycles/subd/CMakeLists.txt b/intern/cycles/subd/CMakeLists.txt
index 75f70753ddf..c0986e9c173 100644
--- a/intern/cycles/subd/CMakeLists.txt
+++ b/intern/cycles/subd/CMakeLists.txt
@@ -6,6 +6,8 @@ set(INC
../kernel/svm
../render
)
+set(INC_SYS
+)
set(SRC
subd_build.cpp
@@ -31,5 +33,6 @@ set(SRC_HEADERS
)
include_directories(${INC})
+include_directories(SYSTEM ${INC_SYS})
add_library(cycles_subd ${SRC} ${SRC_HEADERS})
diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt
index ae8403a14a8..c677f2b13f4 100644
--- a/intern/cycles/util/CMakeLists.txt
+++ b/intern/cycles/util/CMakeLists.txt
@@ -1,6 +1,8 @@
set(INC
.
+)
+set(INC_SYS
${GLEW_INCLUDE_PATH}
${OPENGL_INCLUDE_DIR}
)
@@ -64,5 +66,6 @@ set(SRC_HEADERS
)
include_directories(${INC})
+include_directories(SYSTEM ${INC_SYS})
add_library(cycles_util ${SRC} ${SRC_HEADERS})