[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37961] branches/cycles/intern/cycles/ cmake/external_libs.cmake: Cycles: cmake changes to make win32 use lib/ windows for boost and openimageio.
Daniel Salazar - 3Developer.com
zanqdo at gmail.com
Thu Jun 30 00:30:00 CEST 2011
I'm getting this error now when launching cmake on a clean build dir
with "cmake ../blender -DCYCLES_OIIO=../oiio"
http://www.pasteall.org/22821
dunno if its related to this commit?
Daniel Salazar
3Developer.com
On Wed, Jun 29, 2011 at 1:18 PM, Brecht Van Lommel
<brechtvanlommel at pandora.be> wrote:
> Revision: 37961
> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37961
> Author: blendix
> Date: 2011-06-29 19:18:08 +0000 (Wed, 29 Jun 2011)
> Log Message:
> -----------
> Cycles: cmake changes to make win32 use lib/windows for boost and openimageio.
>
> Modified Paths:
> --------------
> branches/cycles/intern/cycles/cmake/external_libs.cmake
>
> Modified: branches/cycles/intern/cycles/cmake/external_libs.cmake
> ===================================================================
> --- branches/cycles/intern/cycles/cmake/external_libs.cmake 2011-06-29 19:16:32 UTC (rev 37960)
> +++ branches/cycles/intern/cycles/cmake/external_libs.cmake 2011-06-29 19:18:08 UTC (rev 37961)
> @@ -1,4 +1,19 @@
> ###########################################################################
> +# Windows lib directory libraries
> +
> +IF(WIN32)
> + if(CMAKE_CL_64)
> + set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
> + else()
> + set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
> + endif()
> +
> + SET(CYCLES_OIIO ${LIBDIR}/openimageio)
> + SET(CYCLES_BOOST ${LIBDIR}/boost)
> + SET(Boost_USE_STATIC_LIBS ON)
> +ENDIF()
> +
> +###########################################################################
> # Boost setup
>
> SET(BOOST_ROOT ${CYCLES_BOOST})
> @@ -11,7 +26,7 @@
>
> SET(Boost_USE_MULTITHREADED ON)
>
> -FIND_PACKAGE(Boost 1.34 REQUIRED COMPONENTS filesystem regex system serialization thread)
> +FIND_PACKAGE(Boost 1.34 REQUIRED COMPONENTS filesystem regex system thread)
>
> MESSAGE(STATUS "Boost found ${Boost_FOUND}")
> MESSAGE(STATUS "Boost version ${Boost_VERSION}")
>
> _______________________________________________
> 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