correct some include dirs not being included as SYSTEM paths in cmake.
authorCampbell Barton <ideasman42@gmail.com>
Tue, 2 Oct 2012 03:18:48 +0000 (03:18 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 2 Oct 2012 03:18:48 +0000 (03:18 +0000)
extern/carve/CMakeLists.txt
intern/bsp/CMakeLists.txt
intern/cycles/render/CMakeLists.txt
intern/opencolorio/CMakeLists.txt
source/blender/editors/mask/CMakeLists.txt
source/blender/editors/sculpt_paint/CMakeLists.txt
source/blender/editors/space_clip/CMakeLists.txt
source/gameengine/BlenderRoutines/CMakeLists.txt

index 3916047..5e917ac 100644 (file)
@@ -158,7 +158,7 @@ if(WITH_BOOST)
                -DCARVE_SYSTEM_BOOST
        )
 
-       list(APPEND INC
+       list(APPEND INC_SYS
                ${BOOST_INCLUDE_DIR}
        )
 endif()
index e492c04..136c168 100644 (file)
@@ -62,7 +62,7 @@ if(WITH_BOOST)
                -DCARVE_SYSTEM_BOOST
        )
 
-       list(APPEND INC
+       list(APPEND INC_SYS
                ${BOOST_INCLUDE_DIR}
        )
 endif()
index 6b8e370..e75a3b3 100644 (file)
@@ -7,7 +7,6 @@ set(INC
        ../kernel/osl
        ../bvh
        ../util
-       ${GLEW_INCLUDE_PATH}
 )
 set(INC_SYS
        ${GLEW_INCLUDE_PATH}
index 479bbd3..9f5d4cd 100644 (file)
 #
 # ***** END GPL LICENSE BLOCK *****
 
+set(INC
+       .
+       ../guardedalloc
+)
+
+set(INC_SYS
+)
+
+
 if(WITH_OPENCOLORIO)
-       set(INC
-               .
-               ${OPENCOLORIO_INCLUDE_DIRS}
-       )
 
-       set(SRC
-               ocio_capi.cpp
-               ocio_capi.h
+       list(APPEND INC_SYS
+               ${OPENCOLORIO_INCLUDE_DIRS}
        )
 
        if(WIN32 AND NOT MINGW)
-               list(APPEND INC
+               list(APPEND INC_SYS
                        ${BOOST_INCLUDE_DIR}
                )
        endif()
+
+       set(SRC
+               ocio_capi.cpp
+               ocio_capi.h
+       )
 else()
-       set(INC
-               .
+       list(APPEND INC
                ../../source/blender/blenlib
        )
 
@@ -51,10 +59,6 @@ else()
        )
 endif()
 
-set(INC_SYS
-       ../guardedalloc
-)
-
 add_definitions(
 )
 
index 57be5a2..25fb9cb 100644 (file)
@@ -30,10 +30,10 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
-       ${GLEW_INCLUDE_PATH}
 )
 
 set(INC_SYS
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 043b7ec..ae72dce 100644 (file)
@@ -20,6 +20,7 @@
 
 set(INC
        ../include
+       ../uvedit
        ../../blenkernel
        ../../blenlib
        ../../blenloader
@@ -28,7 +29,6 @@ set(INC
        ../../imbuf
        ../../makesdna
        ../../makesrna
-       ../uvedit
        ../../render/extern/include
        ../../windowmanager
        ../../../../intern/guardedalloc
index ecc4dea..75e3d8d 100644 (file)
@@ -33,10 +33,10 @@ set(INC
        ../../windowmanager
        ../../gpu
        ../../../../intern/guardedalloc
-       ${GLEW_INCLUDE_PATH}
 )
 
 set(INC_SYS
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
index 96b5676..fa0994d 100644 (file)
@@ -28,11 +28,11 @@ set(INC
        ../../../intern/guardedalloc
        ../../../intern/moto/include
        ../../../intern/string
-       ${GLEW_INCLUDE_PATH}
 )
 
 set(INC_SYS
        ${PTHREADS_INCLUDE_DIRS}
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC