[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33962] trunk/blender: CMake: use blender_include_dirs("${OPENGL_INCLUDE_DIR}") rather then blender_include_dirs(${OPENGL_INCLUDE_DIR})

Tamito KAJIYAMA rd6t-kjym at asahi-net.or.jp
Fri Dec 31 22:34:08 CET 2010


Hi Campbell,

Thanks for the fix!  Unfortunately, however, a recent change by Nathan
has a negative effect causing a CMake error.  On a test environment
of mine (64-bit Windows Vista, VS 2008 Pro),

> 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()

this block should simply be:

blender_include_dirs("${OPENGL_INCLUDE_DIR}")

without the if-else-endif statement.  Hope this change does not break
the compilation process in other environments.

Thanks,

-- 
KAJIYAMA, Tamito <rd6t-kjym at asahi-net.or.jp>


----- Original Message ----- 
From: "Campbell Barton" <ideasman42 at gmail.com>
To: <bf-blender-cvs at blender.org>
Sent: Friday, December 31, 2010 4:29 AM
Subject: [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33962] trunk/blender: CMake: use 
blender_include_dirs("${OPENGL_INCLUDE_DIR}") rather then blender_include_dirs(${OPENGL_INCLUDE_DIR})


> Revision: 33962
>          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33962
> Author:   campbellbarton
> Date:     2010-12-31 05:29:11 +0100 (Fri, 31 Dec 2010)
>
> Log Message:
> -----------
> 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.
>
> Modified Paths:
> --------------
>    trunk/blender/CMakeLists.txt
>    trunk/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt
>    trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt
>    trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt
>    trunk/blender/source/blender/makesdna/intern/CMakeLists.txt
>    trunk/blender/source/blender/python/intern/CMakeLists.txt
>    trunk/blender/source/gameengine/CMakeLists.txt
>    trunk/blender/source/gameengine/GamePlayer/xembed/CMakeLists.txt
>
> Modified: trunk/blender/CMakeLists.txt
> ===================================================================
> --- trunk/blender/CMakeLists.txt 2010-12-31 04:12:20 UTC (rev 33961)
> +++ trunk/blender/CMakeLists.txt 2010-12-31 04:29:11 UTC (rev 33962)
> @@ -690,7 +690,7 @@
>  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 @@
> # 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 



More information about the Bf-committers mailing list