[Bf-blender-cvs] [00c8a69] master: Cycles: use SYSTEM for external includes
Campbell Barton
noreply at git.blender.org
Sat Jun 28 20:00:42 CEST 2014
Commit: 00c8a691e921e5e838b96e92290bd9901e1bf3c4
Author: Campbell Barton
Date: Sun Jun 29 03:59:54 2014 +1000
https://developer.blender.org/rB00c8a691e921e5e838b96e92290bd9901e1bf3c4
Cycles: use SYSTEM for external includes
===================================================================
M intern/cycles/CMakeLists.txt
M intern/cycles/cmake/external_libs.cmake
===================================================================
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index efd5ec6..ccf6aac 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -116,7 +116,10 @@ endif()
if(WITH_CYCLES_OSL)
add_definitions(-DWITH_OSL)
add_definitions(-DOSL_STATIC_LIBRARY)
- include_directories(${OSL_INCLUDES})
+ include_directories(
+ SYSTEM
+ ${OSL_INCLUDES}
+ )
endif()
add_definitions(
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake
index 8753ff4..bb174d6 100644
--- a/intern/cycles/cmake/external_libs.cmake
+++ b/intern/cycles/cmake/external_libs.cmake
@@ -8,7 +8,10 @@ if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI)
find_package(GLUT)
message(STATUS "GLUT_FOUND=${GLUT_FOUND}")
- include_directories(${GLUT_INCLUDE_DIR})
+ include_directories(
+ SYSTEM
+ ${GLUT_INCLUDE_DIR}
+ )
endif()
if(WITH_SYSTEM_GLEW)
More information about the Bf-blender-cvs
mailing list