[Erp5-report] r43079 kazuhiko - /erp5/trunk/buildout/software-profiles/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Feb  4 22:06:16 2011
New Revision: 43079

URL: http://svn.erp5.org?rev=43079&view=rev
Log:
build cuneiform with magick++ support.

Modified:
    erp5/trunk/buildout/software-profiles/cuneiform.cfg
    erp5/trunk/buildout/software-profiles/imagemagick.cfg

Modified: erp5/trunk/buildout/software-profiles/cuneiform.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/cuneiform.cfg?rev=43079&r1=43078&r2=43079&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/cuneiform.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/cuneiform.cfg [utf8] Fri Feb  4 22:06:16 2011
@@ -1,6 +1,7 @@
 [buildout]
 extends =
   cmake.cfg
+  imagemagick.cfg
 parts = cuneiform
 
 [cuneiform]
@@ -14,6 +15,9 @@ configure-command =
     -DCMAKE_INSTALL_RPATH=${:location}/lib64:${:location}/lib \
     -DCMAKE_INSTALL_PREFIX=${:location} \
     -DNO_SYSTEM_ENVIRONMENT_PATH=ON \
+    -DCMAKE_INCLUDE_PATH=${imagemagick:location}/include \
+    -DCMAKE_LIBRARY_PATH=${imagemagick:location}/lib \
+    -DCMAKE_INSTALL_RPATH=${:location}/lib64:${:location}/lib:${imagemagick:location}/lib \
     -DCMAKE_BUILD_TYPE=release \
     ..
 make-binary =

Modified: erp5/trunk/buildout/software-profiles/imagemagick.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/imagemagick.cfg?rev=43079&r1=43078&r2=43079&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/imagemagick.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/imagemagick.cfg [utf8] Fri Feb  4 22:06:16 2011
@@ -29,7 +29,7 @@ url = http://ftp.nluug.nl/ImageMagick/Im
 md5sum = e2e7252ec282bda9aad6907ecb6a9b98
 configure-options =
   --without-x
-  --without-magick-plus-plus
+  --with-magick-plus-plus
   --disable-openmp
   --disable-opencl
   --without-openexr