CMake: use blender_include_dirs("${OPENGL_INCLUDE_DIR}") rather then blender_include_...
authorCampbell Barton <ideasman42@gmail.com>
Fri, 31 Dec 2010 04:29:11 +0000 (04:29 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 31 Dec 2010 04:29:11 +0000 (04:29 +0000)
Apparently this is needed for MSVC in some cases, reported by Tamito Kajiyama r33895.

CMakeLists.txt
source/blender/imbuf/intern/cineon/CMakeLists.txt
source/blender/imbuf/intern/dds/CMakeLists.txt
source/blender/imbuf/intern/openexr/CMakeLists.txt
source/blender/makesdna/intern/CMakeLists.txt
source/blender/python/intern/CMakeLists.txt
source/gameengine/CMakeLists.txt

index c1e22f9ab0fdf3ff0b5ae3f174ad96c379dad5cd..304c17244d38083171c3efbe712dacf28e5263af 100644 (file)
@@ -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 
index a7660af171418faad00c54c4fdf00ee6b8167ce3..f01de6b26202a997646ff6f616653f72bf85f329 100644 (file)
@@ -27,7 +27,7 @@
 set(INC 
                .
                ..
-               ../../
+               ../..
                ../../../blenkernel
                ../../../blenlib
                ../../../makesdna
index 2ab92bee3e53748faa37279f15e7d98d4f058e8e..7564287ce4abbf76828f866bb77c2a8b93f04618 100644 (file)
@@ -27,8 +27,8 @@
 set(INC 
        .
        ..
+       ../..
        ./intern/include
-       ../../
        ../../../blenlib
        ../../../blenkernel
        ../../../makesdna
index 58edd53139a5433e811f71ed188c6fd54dddb991..ace4f4f9a65455770cd3f4a196eca502e2c77731 100644 (file)
@@ -26,9 +26,9 @@
 
 set(INC 
        .
-       ../../../blenkernel
-       ../../
        ..
+       ../..
+       ../../../blenkernel
        ../../../blenlib
        intern/include
        ../../../../../intern/guardedalloc
index ce41a83ddd275f91b5999225b302145418bb54b1..55a6a3c0879ec218ae6eff20342217c61e6a831c 100644 (file)
 
 # message(STATUS "Configuring makesdna")
 
-blender_include_dirs(../../../../intern/guardedalloc ../)
+blender_include_dirs(
+       ../../../../intern/guardedalloc
+       ..
+)
 
 # Build makesdna executable
 set(SRC
index 26286727fdd646f1d9f56f99177f209c733199d3..dc5559a5b38b08968992a08254125e63de1785e4 100644 (file)
@@ -24,7 +24,7 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC 
-       ../
+       ..
        ../../blenlib
        ../../makesdna
        ../../makesrna
index 53688ab321882a4c1c2e3cbf45244f667888cafc..c3c2b95c40e9bc820dde22f685775ef0eb998b7f 100644 (file)
@@ -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()