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.

7 files changed, 13 insertions, 10 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1e22f9ab0f..304c17244d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 
diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt
index a7660af1714..f01de6b2620 100644
--- a/source/blender/imbuf/intern/cineon/CMakeLists.txt
+++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt
@@ -27,7 +27,7 @@
 set(INC 
 		.
 		..
-		../../
+		../..
 		../../../blenkernel
 		../../../blenlib
 		../../../makesdna
diff --git a/source/blender/imbuf/intern/dds/CMakeLists.txt b/source/blender/imbuf/intern/dds/CMakeLists.txt
index 2ab92bee3e5..7564287ce4a 100644
--- a/source/blender/imbuf/intern/dds/CMakeLists.txt
+++ b/source/blender/imbuf/intern/dds/CMakeLists.txt
@@ -27,8 +27,8 @@
 set(INC 
 	.
 	..
+	../..
 	./intern/include
-	../../
 	../../../blenlib
 	../../../blenkernel
 	../../../makesdna
diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt
index 58edd53139a..ace4f4f9a65 100644
--- a/source/blender/imbuf/intern/openexr/CMakeLists.txt
+++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt
@@ -26,9 +26,9 @@
 
 set(INC 
 	.
-	../../../blenkernel
-	../../
 	..
+	../..
+	../../../blenkernel
 	../../../blenlib
 	intern/include
 	../../../../../intern/guardedalloc
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt
index ce41a83ddd2..55a6a3c0879 100644
--- a/source/blender/makesdna/intern/CMakeLists.txt
+++ b/source/blender/makesdna/intern/CMakeLists.txt
@@ -27,7 +27,10 @@
 
 # message(STATUS "Configuring makesdna")
 
-blender_include_dirs(../../../../intern/guardedalloc ../)
+blender_include_dirs(
+	../../../../intern/guardedalloc
+	..
+)
 
 # Build makesdna executable
 set(SRC
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt
index 26286727fdd..dc5559a5b38 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -24,7 +24,7 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC 
-	../
+	..
 	../../blenlib
 	../../makesdna
 	../../makesrna
diff --git a/source/gameengine/CMakeLists.txt b/source/gameengine/CMakeLists.txt
index 53688ab3218..c3c2b95c40e 100644
--- a/source/gameengine/CMakeLists.txt
+++ b/source/gameengine/CMakeLists.txt
@@ -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()