[Bf-blender-cvs] [9245e1a] master: Fix compilation error after recent commit
Sergey Sharybin
noreply at git.blender.org
Wed Oct 8 00:12:06 CEST 2014
Commit: 9245e1aeb86ebe173849b9543966a42ca3964805
Author: Sergey Sharybin
Date: Wed Oct 8 04:11:23 2014 +0600
Branches: master
https://developer.blender.org/rB9245e1aeb86ebe173849b9543966a42ca3964805
Fix compilation error after recent commit
===================================================================
M CMakeLists.txt
M source/blender/makesrna/intern/CMakeLists.txt
M source/creator/CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fb406f..63dae89 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -330,7 +330,7 @@ option(WITH_GTESTS "Enable GTest unit testing" OFF)
# OpenGL
-option(WITH_GLEW_MX "Support multiple GLEW contexts (experimental)" ON )
+option(WITH_GLEW_MX "Support multiple GLEW contexts (experimental)" OFF )
option(WITH_GLEW_ES "Switches to experimental copy of GLEW that has support for OpenGL ES. (temporary option for development purposes)" OFF)
option(WITH_GL_EGL "Use the EGL OpenGL system library instead of the platform specific OpenGL system library (CGL, glX, or WGL)" OFF)
option(WITH_GL_PROFILE_COMPAT "Support using the OpenGL 'compatibility' profile. (deprecated)" ON )
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 9a53ebc..5d736f9 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -300,7 +300,7 @@ blender_include_dirs(
)
blender_include_dirs_sys(
- ${GLEW_INCLUDE_PATH}
+ "${GLEW_INCLUDE_PATH}"
)
add_executable(makesrna ${SRC} ${SRC_RNA_INC} ${SRC_DNA_INC})
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 20c2448..73400da 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -41,7 +41,7 @@ blender_include_dirs(
)
add_definitions(${GL_DEFINITIONS})
-blender_include_dirs(${GLEW_INCLUDE_PATH})
+blender_include_dirs("${GLEW_INCLUDE_PATH}")
if(WIN32)
blender_include_dirs(../../intern/utfconv)
More information about the Bf-blender-cvs
mailing list