forked from bartvdbraak/blender
CMake: use blender_include_dirs("${OPENGL_INCLUDE_DIR}") rather then blender_include_dirs(${OPENGL_INCLUDE_DIR})
Apparently this is needed for MSVC in some cases, reported by Tamito Kajiyama r33895.
This commit is contained in:
parent
5593436652
commit
6fdfa97edb
@ -690,7 +690,7 @@ elseif(WIN32)
|
||||
endif()
|
||||
|
||||
# used in many places so include globally, like OpenGL
|
||||
blender_include_dirs(${PTHREADS_INC})
|
||||
blender_include_dirs("${PTHREADS_INC}")
|
||||
|
||||
elseif(APPLE)
|
||||
|
||||
@ -946,9 +946,9 @@ endif()
|
||||
# Configure OpenGL.
|
||||
find_package(OpenGL)
|
||||
if(MSVC)
|
||||
include_directories(${OPENGL_INCLUDE_DIR})
|
||||
include_directories("${OPENGL_INCLUDE_DIR}")
|
||||
else()
|
||||
blender_include_dirs(${OPENGL_INCLUDE_DIR})
|
||||
blender_include_dirs("${OPENGL_INCLUDE_DIR}")
|
||||
endif()
|
||||
# unset(OPENGL_LIBRARIES CACHE) # not compat with older cmake
|
||||
# unset(OPENGL_xmesa_INCLUDE_DIR CACHE) # not compat with older cmake
|
||||
|
@ -27,7 +27,7 @@
|
||||
set(INC
|
||||
.
|
||||
..
|
||||
../../
|
||||
../..
|
||||
../../../blenkernel
|
||||
../../../blenlib
|
||||
../../../makesdna
|
||||
|
@ -27,8 +27,8 @@
|
||||
set(INC
|
||||
.
|
||||
..
|
||||
../..
|
||||
./intern/include
|
||||
../../
|
||||
../../../blenlib
|
||||
../../../blenkernel
|
||||
../../../makesdna
|
||||
|
@ -26,9 +26,9 @@
|
||||
|
||||
set(INC
|
||||
.
|
||||
../../../blenkernel
|
||||
../../
|
||||
..
|
||||
../..
|
||||
../../../blenkernel
|
||||
../../../blenlib
|
||||
intern/include
|
||||
../../../../../intern/guardedalloc
|
||||
|
@ -27,7 +27,10 @@
|
||||
|
||||
# message(STATUS "Configuring makesdna")
|
||||
|
||||
blender_include_dirs(../../../../intern/guardedalloc ../)
|
||||
blender_include_dirs(
|
||||
../../../../intern/guardedalloc
|
||||
..
|
||||
)
|
||||
|
||||
# Build makesdna executable
|
||||
set(SRC
|
||||
|
@ -24,7 +24,7 @@
|
||||
# ***** END GPL LICENSE BLOCK *****
|
||||
|
||||
set(INC
|
||||
../
|
||||
..
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -27,7 +27,7 @@
|
||||
|
||||
# there are too many inter-includes so best define here
|
||||
if(WITH_PYTHON)
|
||||
blender_include_dirs(${PYTHON_INC})
|
||||
blender_include_dirs("${PYTHON_INC}")
|
||||
add_definitions(-DWITH_PYTHON)
|
||||
endif()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user