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 3916047ff32b19bd3c4081e56ff59a0845b1d87e..5e917ac1e446e6ae7607237eea707ef162faff5a 100644 (file)
@@ -158,7 +158,7 @@ if(WITH_BOOST)
                -DCARVE_SYSTEM_BOOST
        )
 
                -DCARVE_SYSTEM_BOOST
        )
 
-       list(APPEND INC
+       list(APPEND INC_SYS
                ${BOOST_INCLUDE_DIR}
        )
 endif()
                ${BOOST_INCLUDE_DIR}
        )
 endif()
index e492c04423e1d2b2f482788022d7aa3aace06fd4..136c168bdb82b98b92038b892a97789c3c4544c6 100644 (file)
@@ -62,7 +62,7 @@ if(WITH_BOOST)
                -DCARVE_SYSTEM_BOOST
        )
 
                -DCARVE_SYSTEM_BOOST
        )
 
-       list(APPEND INC
+       list(APPEND INC_SYS
                ${BOOST_INCLUDE_DIR}
        )
 endif()
                ${BOOST_INCLUDE_DIR}
        )
 endif()
index 6b8e3702d038d714a4ac37bb89f64244819979d2..e75a3b37f3beb89b13794b7760dd41086e311d71 100644 (file)
@@ -7,7 +7,6 @@ set(INC
        ../kernel/osl
        ../bvh
        ../util
        ../kernel/osl
        ../bvh
        ../util
-       ${GLEW_INCLUDE_PATH}
 )
 set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 set(INC_SYS
        ${GLEW_INCLUDE_PATH}
index 479bbd3ab0a2554bbf53d9d2f050b17a16f3a5a2..9f5d4cd332c0c432facccc3b27d1412cfa40ff5f 100644 (file)
 #
 # ***** END GPL LICENSE BLOCK *****
 
 #
 # ***** END GPL LICENSE BLOCK *****
 
+set(INC
+       .
+       ../guardedalloc
+)
+
+set(INC_SYS
+)
+
+
 if(WITH_OPENCOLORIO)
 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)
        )
 
        if(WIN32 AND NOT MINGW)
-               list(APPEND INC
+               list(APPEND INC_SYS
                        ${BOOST_INCLUDE_DIR}
                )
        endif()
                        ${BOOST_INCLUDE_DIR}
                )
        endif()
+
+       set(SRC
+               ocio_capi.cpp
+               ocio_capi.h
+       )
 else()
 else()
-       set(INC
-               .
+       list(APPEND INC
                ../../source/blender/blenlib
        )
 
                ../../source/blender/blenlib
        )
 
@@ -51,10 +59,6 @@ else()
        )
 endif()
 
        )
 endif()
 
-set(INC_SYS
-       ../guardedalloc
-)
-
 add_definitions(
 )
 
 add_definitions(
 )
 
index 57be5a2234af9528b94a28d5a463007fb233d8cf..25fb9cb64304f9fbb64ba17079b72299a533b776 100644 (file)
@@ -30,10 +30,10 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
-       ${GLEW_INCLUDE_PATH}
 )
 
 set(INC_SYS
 )
 
 set(INC_SYS
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
 )
 
 set(SRC
index 043b7ecb5cb7e47e8459c73e72c6caef41cdef83..ae72dce14157612211ff09401f5a28e4c3983437 100644 (file)
@@ -20,6 +20,7 @@
 
 set(INC
        ../include
 
 set(INC
        ../include
+       ../uvedit
        ../../blenkernel
        ../../blenlib
        ../../blenloader
        ../../blenkernel
        ../../blenlib
        ../../blenloader
@@ -28,7 +29,6 @@ set(INC
        ../../imbuf
        ../../makesdna
        ../../makesrna
        ../../imbuf
        ../../makesdna
        ../../makesrna
-       ../uvedit
        ../../render/extern/include
        ../../windowmanager
        ../../../../intern/guardedalloc
        ../../render/extern/include
        ../../windowmanager
        ../../../../intern/guardedalloc
index ecc4dea8b05e96f9a70a19c13ece25d38e8a4c53..75e3d8d56851f3ee59ff3f1df7169dfdccc410fa 100644 (file)
@@ -33,10 +33,10 @@ set(INC
        ../../windowmanager
        ../../gpu
        ../../../../intern/guardedalloc
        ../../windowmanager
        ../../gpu
        ../../../../intern/guardedalloc
-       ${GLEW_INCLUDE_PATH}
 )
 
 set(INC_SYS
 )
 
 set(INC_SYS
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
 )
 
 set(SRC
index 96b56768b8fea4eab53f7462422eb68579dbc608..fa0994d788a10d1239e92f4a919a5d9ddc0e301e 100644 (file)
@@ -28,11 +28,11 @@ set(INC
        ../../../intern/guardedalloc
        ../../../intern/moto/include
        ../../../intern/string
        ../../../intern/guardedalloc
        ../../../intern/moto/include
        ../../../intern/string
-       ${GLEW_INCLUDE_PATH}
 )
 
 set(INC_SYS
        ${PTHREADS_INCLUDE_DIRS}
 )
 
 set(INC_SYS
        ${PTHREADS_INCLUDE_DIRS}
+       ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
 )
 
 set(SRC