code cleanup: cycles now uses system includes for boost/oiio.. etc, so we dont get warnings from system headers.
This commit is contained in:
@@ -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)
|
||||
|
@@ -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
|
||||
|
@@ -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})
|
||||
|
@@ -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})
|
||||
|
@@ -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})
|
||||
|
||||
|
@@ -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})
|
||||
|
||||
|
@@ -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})
|
||||
|
||||
|
@@ -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})
|
||||
|
@@ -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})
|
||||
|
Reference in New Issue
Block a user