correct some include dirs not being included as SYSTEM paths in cmake.

This commit is contained in:
Campbell Barton
2012-10-02 03:18:48 +00:00
parent 959dc02f96
commit dc8340fa33
8 changed files with 24 additions and 21 deletions

View File

@@ -158,7 +158,7 @@ if(WITH_BOOST)
-DCARVE_SYSTEM_BOOST -DCARVE_SYSTEM_BOOST
) )
list(APPEND INC list(APPEND INC_SYS
${BOOST_INCLUDE_DIR} ${BOOST_INCLUDE_DIR}
) )
endif() endif()

View File

@@ -62,7 +62,7 @@ if(WITH_BOOST)
-DCARVE_SYSTEM_BOOST -DCARVE_SYSTEM_BOOST
) )
list(APPEND INC list(APPEND INC_SYS
${BOOST_INCLUDE_DIR} ${BOOST_INCLUDE_DIR}
) )
endif() endif()

View File

@@ -7,7 +7,6 @@ set(INC
../kernel/osl ../kernel/osl
../bvh ../bvh
../util ../util
${GLEW_INCLUDE_PATH}
) )
set(INC_SYS set(INC_SYS
${GLEW_INCLUDE_PATH} ${GLEW_INCLUDE_PATH}

View File

@@ -23,25 +23,33 @@
# #
# ***** END GPL LICENSE BLOCK ***** # ***** END GPL LICENSE BLOCK *****
if(WITH_OPENCOLORIO) set(INC
set(INC
. .
../guardedalloc
)
set(INC_SYS
)
if(WITH_OPENCOLORIO)
list(APPEND INC_SYS
${OPENCOLORIO_INCLUDE_DIRS} ${OPENCOLORIO_INCLUDE_DIRS}
) )
if(WIN32 AND NOT MINGW)
list(APPEND INC_SYS
${BOOST_INCLUDE_DIR}
)
endif()
set(SRC set(SRC
ocio_capi.cpp ocio_capi.cpp
ocio_capi.h ocio_capi.h
) )
if(WIN32 AND NOT MINGW)
list(APPEND INC
${BOOST_INCLUDE_DIR}
)
endif()
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(
) )

View File

@@ -30,10 +30,10 @@ set(INC
../../makesrna ../../makesrna
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(INC_SYS set(INC_SYS
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

View File

@@ -20,6 +20,7 @@
set(INC set(INC
../include ../include
../uvedit
../../blenkernel ../../blenkernel
../../blenlib ../../blenlib
../../blenloader ../../blenloader
@@ -28,7 +29,6 @@ set(INC
../../imbuf ../../imbuf
../../makesdna ../../makesdna
../../makesrna ../../makesrna
../uvedit
../../render/extern/include ../../render/extern/include
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc

View File

@@ -33,10 +33,10 @@ set(INC
../../windowmanager ../../windowmanager
../../gpu ../../gpu
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH}
) )
set(INC_SYS set(INC_SYS
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

View File

@@ -28,11 +28,11 @@ set(INC
../../../intern/guardedalloc ../../../intern/guardedalloc
../../../intern/moto/include ../../../intern/moto/include
../../../intern/string ../../../intern/string
${GLEW_INCLUDE_PATH}
) )
set(INC_SYS set(INC_SYS
${PTHREADS_INCLUDE_DIRS} ${PTHREADS_INCLUDE_DIRS}
${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC