[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50772] trunk/blender/intern/cycles: code cleanup: cycles now uses system includes for boost/oiio..
Campbell Barton
ideasman42 at gmail.com
Thu Sep 20 11:04:44 CEST 2012
Revision: 50772
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50772
Author: campbellbarton
Date: 2012-09-20 09:04:43 +0000 (Thu, 20 Sep 2012)
Log Message:
-----------
code cleanup: cycles now uses system includes for boost/oiio.. etc, so we dont get warnings from system headers.
Modified Paths:
--------------
trunk/blender/intern/cycles/CMakeLists.txt
trunk/blender/intern/cycles/app/CMakeLists.txt
trunk/blender/intern/cycles/bvh/CMakeLists.txt
trunk/blender/intern/cycles/device/CMakeLists.txt
trunk/blender/intern/cycles/kernel/CMakeLists.txt
trunk/blender/intern/cycles/kernel/osl/CMakeLists.txt
trunk/blender/intern/cycles/render/CMakeLists.txt
trunk/blender/intern/cycles/subd/CMakeLists.txt
trunk/blender/intern/cycles/util/CMakeLists.txt
Modified: trunk/blender/intern/cycles/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/CMakeLists.txt 2012-09-20 07:43:48 UTC (rev 50771)
+++ trunk/blender/intern/cycles/CMakeLists.txt 2012-09-20 09:04:43 UTC (rev 50772)
@@ -56,6 +56,7 @@
add_definitions(-DWITH_MULTI)
include_directories(
+ SYSTEM
${BOOST_INCLUDE_DIR}
${OPENIMAGEIO_INCLUDE_DIRS}
${OPENIMAGEIO_INCLUDE_DIRS}/OpenImageIO)
Modified: trunk/blender/intern/cycles/app/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/app/CMakeLists.txt 2012-09-20 07:43:48 UTC (rev 50771)
+++ trunk/blender/intern/cycles/app/CMakeLists.txt 2012-09-20 09:04:43 UTC (rev 50772)
@@ -9,6 +9,8 @@
../render
../subd
)
+set(INC_SYS
+)
set(LIBRARIES
cycles_device
@@ -38,6 +40,7 @@
endif()
include_directories(${INC})
+include_directories(SYSTEM ${INC_SYS})
if(WITH_CYCLES_TEST)
set(SRC
Modified: trunk/blender/intern/cycles/bvh/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/bvh/CMakeLists.txt 2012-09-20 07:43:48 UTC (rev 50771)
+++ trunk/blender/intern/cycles/bvh/CMakeLists.txt 2012-09-20 09:04:43 UTC (rev 50772)
@@ -7,6 +7,8 @@
../util
../device
)
+set(INC_SYS
+)
set(SRC
bvh.cpp
@@ -28,5 +30,6 @@
)
include_directories(${INC})
+include_directories(SYSTEM ${INC_SYS})
add_library(cycles_bvh ${SRC} ${SRC_HEADERS})
Modified: trunk/blender/intern/cycles/device/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/device/CMakeLists.txt 2012-09-20 07:43:48 UTC (rev 50771)
+++ trunk/blender/intern/cycles/device/CMakeLists.txt 2012-09-20 09:04:43 UTC (rev 50772)
@@ -6,6 +6,8 @@
../kernel/osl
../util
../render
+)
+set(INC_SYS
${OPENGL_INCLUDE_DIR}
${GLEW_INCLUDE_PATH}
)
@@ -31,5 +33,6 @@
add_definitions(-DGLEW_STATIC)
include_directories(${INC})
+include_directories(SYSTEM ${INC_SYS})
add_library(cycles_device ${SRC} ${SRC_HEADERS})
Modified: trunk/blender/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/CMakeLists.txt 2012-09-20 07:43:48 UTC (rev 50771)
+++ trunk/blender/intern/cycles/kernel/CMakeLists.txt 2012-09-20 09:04:43 UTC (rev 50772)
@@ -5,6 +5,8 @@
osl
svm
)
+set(INC_SYS
+)
set(SRC
kernel.cpp
@@ -135,6 +137,7 @@
# CPU module
include_directories(${INC})
+include_directories(SYSTEM ${INC_SYS})
add_library(cycles_kernel ${SRC} ${SRC_HEADERS} ${SRC_SVM_HEADERS})
Modified: trunk/blender/intern/cycles/kernel/osl/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/CMakeLists.txt 2012-09-20 07:43:48 UTC (rev 50771)
+++ trunk/blender/intern/cycles/kernel/osl/CMakeLists.txt 2012-09-20 09:04:43 UTC (rev 50772)
@@ -7,6 +7,8 @@
../../util
../../device
)
+set(INC_SYS
+)
set(SRC
background.cpp
@@ -39,6 +41,7 @@
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})
Modified: trunk/blender/intern/cycles/render/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/render/CMakeLists.txt 2012-09-20 07:43:48 UTC (rev 50771)
+++ trunk/blender/intern/cycles/render/CMakeLists.txt 2012-09-20 09:04:43 UTC (rev 50772)
@@ -9,6 +9,9 @@
../util
${GLEW_INCLUDE_PATH}
)
+set(INC_SYS
+ ${GLEW_INCLUDE_PATH}
+)
set(SRC
attribute.cpp
@@ -64,6 +67,7 @@
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})
Modified: trunk/blender/intern/cycles/subd/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/subd/CMakeLists.txt 2012-09-20 07:43:48 UTC (rev 50771)
+++ trunk/blender/intern/cycles/subd/CMakeLists.txt 2012-09-20 09:04:43 UTC (rev 50772)
@@ -6,6 +6,8 @@
../kernel/svm
../render
)
+set(INC_SYS
+)
set(SRC
subd_build.cpp
@@ -31,5 +33,6 @@
)
include_directories(${INC})
+include_directories(SYSTEM ${INC_SYS})
add_library(cycles_subd ${SRC} ${SRC_HEADERS})
Modified: trunk/blender/intern/cycles/util/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/util/CMakeLists.txt 2012-09-20 07:43:48 UTC (rev 50771)
+++ trunk/blender/intern/cycles/util/CMakeLists.txt 2012-09-20 09:04:43 UTC (rev 50772)
@@ -1,6 +1,8 @@
set(INC
.
+)
+set(INC_SYS
${GLEW_INCLUDE_PATH}
${OPENGL_INCLUDE_DIR}
)
@@ -64,5 +66,6 @@
)
include_directories(${INC})
+include_directories(SYSTEM ${INC_SYS})
add_library(cycles_util ${SRC} ${SRC_HEADERS})
More information about the Bf-blender-cvs
mailing list