[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47439] trunk/blender/CMakeLists.txt: only use tiff/exr when enabled.

[Eugenio Pignataro]

1+



Eugenio Pignataro
Drawing & Digital Art.
-------------------------------
Sitio: www.oscurart.com.ar
Email: info at oscurart.com.ar
Móvil: 15-5177-4936
International Phone Calls
Mobile: (54.911) 5177-4936

On 06/04/2012 10:21 PM, Daniel Salazar - 3Developer.com wrote:
> I think this broke compilation in linux cmake
>
> http://www.pasteall.org/32599
>
> Daniel Salazar
> patazstudio.com
>
>
> On Mon, Jun 4, 2012 at 4:34 PM, Campbell Barton<ideasman42 at gmail.com>wrote:
>
>> Revision: 47439
>>
>> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47439
>> Author:   campbellbarton
>> Date:     2012-06-04 22:34:28 +0000 (Mon, 04 Jun 2012)
>> Log Message:
>> -----------
>> only use tiff/exr when enabled.
>>
>> Modified Paths:
>> --------------
>>     trunk/blender/CMakeLists.txt
>>
>> Modified: trunk/blender/CMakeLists.txt
>> ===================================================================
>> --- trunk/blender/CMakeLists.txt        2012-06-04 22:29:17 UTC (rev 47438)
>> +++ trunk/blender/CMakeLists.txt        2012-06-04 22:34:28 UTC (rev 47439)
>> @@ -1,3 +1,4 @@
>> +set(Boost_DEBUG TRUE)
>>   # ***** BEGIN GPL LICENSE BLOCK *****
>>   #
>>   # This program is free software; you can redistribute it and/or
>> @@ -647,10 +648,17 @@
>>
>>                 find_package(OpenImageIO)
>>
>> -               set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES}
>> ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES}
>> ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
>> +               set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES}
>> ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
>>                 set(OPENIMAGEIO_LIBPATH)  # TODO, remove and reference the
>> absolute path everywhere
>>                 set(OPENIMAGEIO_DEFINITIONS)
>>
>> +               if(WITH_IMAGE_TIFF)
>> +                       set(OPENIMAGEIO_LIBRARIES
>> "${OPENIMAGEIO_LIBRARIES} ${TIFF_LIBRARY}")
>> +               endif()
>> +               if(WITH_IMAGE_OPENEXR)
>> +                       set(OPENIMAGEIO_LIBRARIES
>> "${OPENIMAGEIO_LIBRARIES} ${OPENEXR_LIBRARIES}")
>> +               endif()
>> +
>>                 if(NOT OPENIMAGEIO_FOUND)
>>                         set(WITH_OPENIMAGEIO OFF)
>>                         set(WITH_CYCLES OFF)
>>
>> _______________________________________________
>> Bf-blender-cvs mailing list
>> Bf-blender-cvs at blender.org
>> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>>
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers