[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22456] branches/blender2.5/blender: cmake changes

Nicholas Bishop nicholasbishop at gmail.com
Sat Aug 15 05:15:05 CEST 2009


FYI, this commit adds the use of the UNSET command, which requires
cmake >= 2.6.3. No big deal, but current Ubuntu cmake version is
2.6.2, so anyone building there will need to build cmake manually.

-Nicholas

On Fri, Aug 14, 2009 at 1:16 PM, Campbell Barton<ideasman42 at gmail.com> wrote:
> Revision: 22456
>          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22456
> Author:   campbellbarton
> Date:     2009-08-14 19:16:16 +0200 (Fri, 14 Aug 2009)
>
> Log Message:
> -----------
> cmake changes
> - set python to 3.1 on linux (dont use FindPackage for now)
> - remove duplicate settings (disable cache for copied settings, was quite confusing)
> - added an option WITH_INSTALL, when disabled scripts and language files wont be copied to the target dir (better for quick builds)
> - remove .svn (was still CVS), and pyc/pyc files after copy
> - copy the 'io' as well as 'ui'
>
> Modified Paths:
> --------------
>    branches/blender2.5/blender/CMake/macros.cmake
>    branches/blender2.5/blender/CMakeLists.txt
>    branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt
>    branches/blender2.5/blender/source/blender/python/generic/BGL.h
>    branches/blender2.5/blender/source/creator/CMakeLists.txt
>
> Modified: branches/blender2.5/blender/CMake/macros.cmake
> ===================================================================
> --- branches/blender2.5/blender/CMake/macros.cmake      2009-08-14 17:12:04 UTC (rev 22455)
> +++ branches/blender2.5/blender/CMake/macros.cmake      2009-08-14 17:16:16 UTC (rev 22456)
> @@ -42,11 +42,15 @@
>   if(COMMAND cmake_policy)
>     CMAKE_POLICY(SET CMP0003 NEW)
>   endif(COMMAND cmake_policy)
> -  LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
> +  LINK_DIRECTORIES(${PYTHON_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
>   LINK_DIRECTORIES(${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH})
>   IF(WITH_INTERNATIONAL)
> +    LINK_DIRECTORIES(${ICONV_LIBPATH})
>     LINK_DIRECTORIES(${GETTEXT_LIBPATH})
>   ENDIF(WITH_INTERNATIONAL)
> +  IF(WITH_SDL)
> +    LINK_DIRECTORIES(${SDL_LIBPATH})
> +  ENDIF(WITH_SDL)
>   IF(WITH_OPENAL)
>     LINK_DIRECTORIES(${OPENAL_LIBPATH})
>   ENDIF(WITH_OPENAL)
>
> Modified: branches/blender2.5/blender/CMakeLists.txt
> ===================================================================
> --- branches/blender2.5/blender/CMakeLists.txt  2009-08-14 17:12:04 UTC (rev 22455)
> +++ branches/blender2.5/blender/CMakeLists.txt  2009-08-14 17:16:16 UTC (rev 22456)
> @@ -69,6 +69,7 @@
>  OPTION(WITH_OPENMP             "Enable OpenMP (has to be supported by the compiler)"   OFF)
>  OPTION(WITH_WEBPLUGIN          "Enable Web Plugin (Unix only)"                         OFF)
>  OPTION(WITH_FFTW3              "Enable FFTW3 support"                          OFF)
> +OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
>
>  IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
>   MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
> @@ -96,6 +97,8 @@
>       SET(WITH_OPENAL ON)
>       SET(OPENAL_LIB ${OPENAL_LIBRARY})
>       SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
> +      UNSET(OPENAL_LIBRARY CACHE)
> +      UNSET(OPENAL_INCLUDE_DIR CACHE)
>     ELSE(OPENAL_FOUND)
>       SET(WITH_OPENAL OFF)
>     ENDIF(OPENAL_FOUND)
> @@ -111,6 +114,7 @@
>     PATHS
>     /sw/lib
>   )
> +
>   IF(INTL_LIBRARY AND ICONV_LIBRARY)
>     SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
>   ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
> @@ -118,18 +122,35 @@
>   FIND_PACKAGE(Freetype)
>   SET(FREETYPE_INC "${FREETYPE_INCLUDE_DIR_freetype2}" CACHE STRING "")
>   SET(FREETYPE_LIB "${FREETYPE_LIBRARY}" CACHE STRING "")
> +  UNSET(FREETYPE_INCLUDE_DIR_freetype2 CACHE)
> +  UNSET(FREETYPE_LIBRARY CACHE)
> +  UNSET(FREETYPE_INCLUDE_DIR_ft2build CACHE)
>
> -  FIND_PACKAGE(PythonLibs)
> -  SET(PYTHON_INC "${PYTHON_INCLUDE_PATH}" CACHE STRING "")
> -  SET(PYTHON_LIB "${PYTHON_LIBRARIES}" CACHE STRING "")
> -  FIND_PACKAGE(PythonInterp)
> -  SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
> +  # No way to set py31. remove for now.
> +  # FIND_PACKAGE(PythonLibs)
> +  SET(PYTHON /usr)
> +  SET(PYTHON_VERSION 3.1)
> +  SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
> +  # SET(PYTHON_BINARY python) # not used yet
> +  SET(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
> +  SET(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
> +
> +  # FIND_PACKAGE(PythonInterp) # not used yet
> +  # SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
> +
>   SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
>
>   IF(WITH_SDL)
>     FIND_PACKAGE(SDL)
> -    SET(SDL_INC ${SDL_INCLUDE_DIR})
> -    SET(SDL_LIB ${SDL_LIBRARY})
> +    IF(SDL_FOUND)
> +      SET(SDL_INC ${SDL_INCLUDE_DIR})
> +      SET(SDL_LIB ${SDL_LIBRARY})
> +      UNSET(SDL_INCLUDE_DIR CACHE)
> +      UNSET(SDL_LIBRARY CACHE)
> +      UNSET(SDLMAIN_LIBRARY CACHE)
> +    ELSE(SDL_FOUND)
> +      SET(WITH_SDL OFF)
> +    ENDIF(SDL_FOUND)
>   ENDIF(WITH_SDL)
>
>   FIND_PATH(OPENEXR_INC
> @@ -208,22 +229,22 @@
>   SET(PYTHON ${LIBDIR}/python)
>   SET(PYTHON_VERSION 3.1)
>   SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
> -  SET(PYTHON_BINARY python)
> +  # SET(PYTHON_BINARY python) # not used yet
>   SET(PYTHON_LIB python31)
>   SET(PYTHON_LIBPATH ${PYTHON}/lib)
>
>   IF(CMAKE_CL_64)
>     SET(WITH_OPENAL OFF)
>   ELSE(CMAKE_CL_64)
> -       #SET(WITH_OPENAL ON)
> -       SET(OPENAL ${LIBDIR}/openal)
> -       SET(OPENAL_INC ${OPENAL}/include)
> -       SET(OPENAL_LIB wrap_oal)
> -       SET(OPENAL_LIBPATH ${OPENAL}/lib)
> +    #SET(WITH_OPENAL ON)
> +    SET(OPENAL ${LIBDIR}/openal)
> +    SET(OPENAL_INC ${OPENAL}/include)
> +    SET(OPENAL_LIB wrap_oal)
> +    SET(OPENAL_LIBPATH ${OPENAL}/lib)
>   ENDIF(CMAKE_CL_64)
>
>   IF(CMAKE_CL_64)
> -       SET(PNG_LIBRARIES libpng)
> +    SET(PNG_LIBRARIES libpng)
>   ELSE(CMAKE_CL_64)
>     SET(PNG_LIBRARIES libpng_st)
>   ENDIF(CMAKE_CL_64)
> @@ -245,18 +266,18 @@
>   SET(ICONV_LIBPATH ${ICONV}/lib)
>
>   IF(WITH_FFTW3)
> -         SET(FFTW3 ${LIBDIR}/fftw3)
> -         SET(FFTW3_INC ${FFTW3}/include)
> -         SET(FFTW3_LIB libfftw)
> -         SET(FFTW3_LIBPATH ${FFTW3}/lib)
> +      SET(FFTW3 ${LIBDIR}/fftw3)
> +      SET(FFTW3_INC ${FFTW3}/include)
> +      SET(FFTW3_LIB libfftw)
> +      SET(FFTW3_LIBPATH ${FFTW3}/lib)
>   ENDIF(WITH_FFTW3)
>
>   SET(GETTEXT ${LIBDIR}/gettext)
>   SET(GETTEXT_INC ${GETTEXT}/include)
>   IF(CMAKE_CL_64)
> -       SET(GETTEXT_LIB gettextlib)
> +    SET(GETTEXT_LIB gettextlib)
>   ELSE(CMAKE_CL_64)
> -       SET(GETTEXT_LIB gnu_gettext)
> +    SET(GETTEXT_LIB gnu_gettext)
>   ENDIF(CMAKE_CL_64)
>   SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
>
> @@ -352,6 +373,8 @@
>       SET(WITH_OPENAL ON)
>       SET(OPENAL_LIB ${OPENAL_LIBRARY})
>       SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
> +      UNSET(OPENAL_LIBRARY CACHE)
> +      UNSET(OPENAL_INCLUDE_DIR CACHE)
>     ELSE(OPENAL_FOUND)
>       SET(WITH_OPENAL OFF)
>     ENDIF(OPENAL_FOUND)
> @@ -365,7 +388,7 @@
>
>     SET(PYTHON ${LIBDIR}/python)
>     SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
> -    SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "")
> +    # SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "") # not used yet
>     SET(PYTHON_LIB python${PYTHON_VERSION})
>     SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}" CACHE STRING "")
>     #    SET(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
> @@ -375,7 +398,7 @@
>     SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
>     SET(PYTHON_VERSION 2.5)
>     SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "")
> -    SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "")
> +    # SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "") # not used yet
>     SET(PYTHON_LIB "")
>     SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "")
>     SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
> @@ -388,9 +411,9 @@
>
>   IF(WITH_FFTW3)
>     SET(FFTW3 ${LIBDIR}/fftw3)
> -       SET(FFTW3_INC ${FFTW3}/include)
> -       SET(FFTW3_LIB libfftw)
> -       SET(FFTW3_LIBPATH ${FFTW3}/lib)
> +    SET(FFTW3_INC ${FFTW3}/include)
> +    SET(FFTW3_LIB libfftw)
> +    SET(FFTW3_LIBPATH ${FFTW3}/lib)
>   ENDIF(WITH_FFTW3)
>
>   SET(PNG_LIBRARIES png)
> @@ -477,6 +500,9 @@
>  # Configure OpenGL.
>  FIND_PACKAGE(OpenGL)
>  INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
> +UNSET(OPENGL_LIBRARIES CACHE)
> +UNSET(OPENGL_xmesa_INCLUDE_DIR CACHE)
> +
>  #-----------------------------------------------------------------------------
>  # Extra compile flags
>  IF(WITH_GAMEENGINE)
>
> Modified: branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt
> ===================================================================
> --- branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt  2009-08-14 17:12:04 UTC (rev 22455)
> +++ branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt  2009-08-14 17:16:16 UTC (rev 22456)
> @@ -29,9 +29,12 @@
>   ../blenkernel ../../../extern/glew/include .
>   ${FTGL_INC}
>   ${FREETYPE_INC}
> -  ${GETTEXT_INC}
>  )
>
> +IF(WITH_INTERNATIONAL)
> +  SET(INC ${INC} ${GETTEXT_INC})
> +ENDIF(WITH_INTERNATIONAL)
> +
>  IF(WIN32)
>   ADD_DEFINITIONS(-D_WIN32 -DUSE_GETTEXT_DLL)
>  ENDIF(WIN32)
>
> Modified: branches/blender2.5/blender/source/blender/python/generic/BGL.h
> ===================================================================
> --- branches/blender2.5/blender/source/blender/python/generic/BGL.h     2009-08-14 17:12:04 UTC (rev 22455)
> +++ branches/blender2.5/blender/source/blender/python/generic/BGL.h     2009-08-14 17:16:16 UTC (rev 22456)
> @@ -304,31 +304,30 @@
>
>  #define ret_def_void
>  #define ret_set_void
> -/* would use Py_RETURN_NONE - except for py 2.3 doesnt have it */
> -#define ret_ret_void    { Py_INCREF(Py_None); return Py_None; }
> +#define ret_ret_void    return Py_INCREF(Py_None), Py_None
>
>  #define ret_def_GLint   int ret_int
>  #define ret_set_GLint   ret_int=
> -#define ret_ret_GLint   return PyLong_FromLong(ret_int);
> +#define ret_ret_GLint   return PyLong_FromLong(ret_int)
>
>  #define ret_def_GLuint    unsigned int ret_uint
>  #define ret_set_GLuint    ret_uint=
> -#define ret_ret_GLuint    return PyLong_FromLong((long) ret_uint);
> +#define ret_ret_GLuint    return PyLong_FromLong((long) ret_uint)
>
>  #define ret_def_GLenum    unsigned int ret_uint
>  #define ret_set_GLenum    ret_uint=
> -#define ret_ret_GLenum    return PyLong_FromLong((long) ret_uint);
> +#define ret_ret_GLenum    return PyLong_FromLong((long) ret_uint)
>
>  #define ret_def_GLboolean unsigned char ret_bool
>  #define ret_set_GLboolean ret_bool=
> -#define ret_ret_GLboolean return PyLong_FromLong((long) ret_bool);
> +#define ret_ret_GLboolean return PyLong_FromLong((long) ret_bool)
>
>  #define ret_def_GLstring  const unsigned char *ret_str;
>  #define ret_set_GLstring  ret_str=
>
>  #define ret_ret_GLstring \
>        if (ret_str) {\
> -               return PyUnicode_FromString(ret_str);\
> +               return PyUnicode_FromString((const char *)ret_str);\
>        } else {\
>                PyErr_SetString(PyExc_AttributeError, "could not get opengl string");\
>                return NULL;\
>
> Modified: branches/blender2.5/blender/source/creator/CMakeLists.txt
> ===================================================================
> --- branches/blender2.5/blender/source/creator/CMakeLists.txt   2009-08-14 17:12:04 UTC (rev 22455)
> +++ branches/blender2.5/blender/source/creator/CMakeLists.txt   2009-08-14 17:16:16 UTC (rev 22456)
> @@ -84,126 +84,159 @@
>
>  SET(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
>
> +IF(WITH_INSTALL)
>
> -IF(UNIX)
> -  ADD_CUSTOM_COMMAND(TARGET blender
> -    POST_BUILD
> -    MAIN_DEPENDENCY blender
> -    #COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/plugins ${TARGETDIR}/
> -    #COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/text/* ${TARGETDIR}/
> -  )
> -ENDIF(UNIX)
> +  IF(UNIX)
>
> @@ Diff output truncated at 10240 characters. @@
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>


More information about the Bf-committers mailing list