[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29896] trunk/blender: OSX: CMake and scons default settings updated to allow build with LCMS lib

Damien Plisson damien.plisson at yahoo.fr
Sat Jul 3 12:01:42 CEST 2010


Revision: 29896
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29896
Author:   damien78
Date:     2010-07-03 12:01:41 +0200 (Sat, 03 Jul 2010)

Log Message:
-----------
OSX: CMake and scons default settings updated to allow build with LCMS lib

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/config/darwin-config.py

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2010-07-03 09:10:56 UTC (rev 29895)
+++ trunk/blender/CMakeLists.txt	2010-07-03 10:01:41 UTC (rev 29896)
@@ -711,7 +711,12 @@
 		SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
 	ENDIF(WITH_OPENEXR)
 
-    # TODO: IF(WITH_LCMS)
+	IF(WITH_LCMS)
+		SET(LCMS ${LIBDIR}/lcms)
+		SET(LCMS_INCLUDE_DIR ${LCMS}/include)
+		SET(LCMS_LIBRARY lcms)
+		SET(LCMS_LIBPATH ${LCMS}/lib)
+	ENDIF(WITH_LCMS)
 
 	IF(WITH_FFMPEG)
 		SET(FFMPEG ${LIBDIR}/ffmpeg)

Modified: trunk/blender/config/darwin-config.py
===================================================================
--- trunk/blender/config/darwin-config.py	2010-07-03 09:10:56 UTC (rev 29895)
+++ trunk/blender/config/darwin-config.py	2010-07-03 10:01:41 UTC (rev 29896)
@@ -151,6 +151,9 @@
 
 WITH_BF_DDS = True
 
+#Color Management System
+WITH_BF_LCMS = True
+
 WITH_BF_JPEG = True
 BF_JPEG = LIBDIR + '/jpeg'
 BF_JPEG_INC = '${BF_JPEG}/include'





More information about the Bf-blender-cvs mailing list