correct some include dirs not being included as SYSTEM paths in cmake.
This commit is contained in:
2
extern/carve/CMakeLists.txt
vendored
2
extern/carve/CMakeLists.txt
vendored
@@ -158,7 +158,7 @@ if(WITH_BOOST)
|
||||
-DCARVE_SYSTEM_BOOST
|
||||
)
|
||||
|
||||
list(APPEND INC
|
||||
list(APPEND INC_SYS
|
||||
${BOOST_INCLUDE_DIR}
|
||||
)
|
||||
endif()
|
||||
|
@@ -62,7 +62,7 @@ if(WITH_BOOST)
|
||||
-DCARVE_SYSTEM_BOOST
|
||||
)
|
||||
|
||||
list(APPEND INC
|
||||
list(APPEND INC_SYS
|
||||
${BOOST_INCLUDE_DIR}
|
||||
)
|
||||
endif()
|
||||
|
@@ -7,7 +7,6 @@ set(INC
|
||||
../kernel/osl
|
||||
../bvh
|
||||
../util
|
||||
${GLEW_INCLUDE_PATH}
|
||||
)
|
||||
set(INC_SYS
|
||||
${GLEW_INCLUDE_PATH}
|
||||
|
@@ -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 @@ else()
|
||||
)
|
||||
endif()
|
||||
|
||||
set(INC_SYS
|
||||
../guardedalloc
|
||||
)
|
||||
|
||||
add_definitions(
|
||||
)
|
||||
|
||||
|
@@ -30,10 +30,10 @@ set(INC
|
||||
../../makesrna
|
||||
../../windowmanager
|
||||
../../../../intern/guardedalloc
|
||||
${GLEW_INCLUDE_PATH}
|
||||
)
|
||||
|
||||
set(INC_SYS
|
||||
${GLEW_INCLUDE_PATH}
|
||||
)
|
||||
|
||||
set(SRC
|
||||
|
@@ -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
|
||||
|
@@ -33,10 +33,10 @@ set(INC
|
||||
../../windowmanager
|
||||
../../gpu
|
||||
../../../../intern/guardedalloc
|
||||
${GLEW_INCLUDE_PATH}
|
||||
)
|
||||
|
||||
set(INC_SYS
|
||||
${GLEW_INCLUDE_PATH}
|
||||
)
|
||||
|
||||
set(SRC
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user