[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51000] trunk/blender: correct some include dirs not being included as SYSTEM paths in cmake.
Campbell Barton
ideasman42 at gmail.com
Tue Oct 2 05:18:52 CEST 2012
Revision: 51000
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51000
Author: campbellbarton
Date: 2012-10-02 03:18:48 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
correct some include dirs not being included as SYSTEM paths in cmake.
Modified Paths:
--------------
trunk/blender/extern/carve/CMakeLists.txt
trunk/blender/intern/bsp/CMakeLists.txt
trunk/blender/intern/cycles/render/CMakeLists.txt
trunk/blender/intern/opencolorio/CMakeLists.txt
trunk/blender/source/blender/editors/mask/CMakeLists.txt
trunk/blender/source/blender/editors/sculpt_paint/CMakeLists.txt
trunk/blender/source/blender/editors/space_clip/CMakeLists.txt
trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
Modified: trunk/blender/extern/carve/CMakeLists.txt
===================================================================
--- trunk/blender/extern/carve/CMakeLists.txt 2012-10-02 01:10:18 UTC (rev 50999)
+++ trunk/blender/extern/carve/CMakeLists.txt 2012-10-02 03:18:48 UTC (rev 51000)
@@ -158,7 +158,7 @@
-DCARVE_SYSTEM_BOOST
)
- list(APPEND INC
+ list(APPEND INC_SYS
${BOOST_INCLUDE_DIR}
)
endif()
Modified: trunk/blender/intern/bsp/CMakeLists.txt
===================================================================
--- trunk/blender/intern/bsp/CMakeLists.txt 2012-10-02 01:10:18 UTC (rev 50999)
+++ trunk/blender/intern/bsp/CMakeLists.txt 2012-10-02 03:18:48 UTC (rev 51000)
@@ -62,7 +62,7 @@
-DCARVE_SYSTEM_BOOST
)
- list(APPEND INC
+ list(APPEND INC_SYS
${BOOST_INCLUDE_DIR}
)
endif()
Modified: trunk/blender/intern/cycles/render/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/render/CMakeLists.txt 2012-10-02 01:10:18 UTC (rev 50999)
+++ trunk/blender/intern/cycles/render/CMakeLists.txt 2012-10-02 03:18:48 UTC (rev 51000)
@@ -7,7 +7,6 @@
../kernel/osl
../bvh
../util
- ${GLEW_INCLUDE_PATH}
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
Modified: trunk/blender/intern/opencolorio/CMakeLists.txt
===================================================================
--- trunk/blender/intern/opencolorio/CMakeLists.txt 2012-10-02 01:10:18 UTC (rev 50999)
+++ trunk/blender/intern/opencolorio/CMakeLists.txt 2012-10-02 03:18:48 UTC (rev 51000)
@@ -23,25 +23,33 @@
#
# ***** END GPL LICENSE BLOCK *****
+set(INC
+ .
+ ../guardedalloc
+)
+
+set(INC_SYS
+)
+
+
if(WITH_OPENCOLORIO)
- set(INC
- .
+
+ list(APPEND INC_SYS
${OPENCOLORIO_INCLUDE_DIRS}
)
+ if(WIN32 AND NOT MINGW)
+ list(APPEND INC_SYS
+ ${BOOST_INCLUDE_DIR}
+ )
+ endif()
+
set(SRC
ocio_capi.cpp
ocio_capi.h
)
-
- if(WIN32 AND NOT MINGW)
- list(APPEND INC
- ${BOOST_INCLUDE_DIR}
- )
- endif()
else()
- set(INC
- .
+ list(APPEND INC
../../source/blender/blenlib
)
@@ -51,10 +59,6 @@
)
endif()
-set(INC_SYS
- ../guardedalloc
-)
-
add_definitions(
)
Modified: trunk/blender/source/blender/editors/mask/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/mask/CMakeLists.txt 2012-10-02 01:10:18 UTC (rev 50999)
+++ trunk/blender/source/blender/editors/mask/CMakeLists.txt 2012-10-02 03:18:48 UTC (rev 51000)
@@ -30,10 +30,10 @@
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
- ${GLEW_INCLUDE_PATH}
)
set(INC_SYS
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/editors/sculpt_paint/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/CMakeLists.txt 2012-10-02 01:10:18 UTC (rev 50999)
+++ trunk/blender/source/blender/editors/sculpt_paint/CMakeLists.txt 2012-10-02 03:18:48 UTC (rev 51000)
@@ -20,6 +20,7 @@
set(INC
../include
+ ../uvedit
../../blenkernel
../../blenlib
../../blenloader
@@ -28,7 +29,6 @@
../../imbuf
../../makesdna
../../makesrna
- ../uvedit
../../render/extern/include
../../windowmanager
../../../../intern/guardedalloc
Modified: trunk/blender/source/blender/editors/space_clip/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_clip/CMakeLists.txt 2012-10-02 01:10:18 UTC (rev 50999)
+++ trunk/blender/source/blender/editors/space_clip/CMakeLists.txt 2012-10-02 03:18:48 UTC (rev 51000)
@@ -33,10 +33,10 @@
../../windowmanager
../../gpu
../../../../intern/guardedalloc
- ${GLEW_INCLUDE_PATH}
)
set(INC_SYS
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt 2012-10-02 01:10:18 UTC (rev 50999)
+++ trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt 2012-10-02 03:18:48 UTC (rev 51000)
@@ -28,11 +28,11 @@
../../../intern/guardedalloc
../../../intern/moto/include
../../../intern/string
- ${GLEW_INCLUDE_PATH}
)
set(INC_SYS
${PTHREADS_INCLUDE_DIRS}
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
More information about the Bf-blender-cvs
mailing list