[Plplot-cvs] SF.net SVN: plplot:[12277] trunk

[<ai...@us...>]

Revision: 12277
          http://plplot.svn.sourceforge.net/plplot/?rev=12277&view=rev
Author:   airwin
Date:     2012-11-19 00:02:13 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
Build-system fixups for new epscairo device.

Modified Paths:
--------------
    trunk/cmake/modules/plplot_functions.cmake
    trunk/examples/CMakeLists.txt
    trunk/plplot_test/plplot-test.sh.cmake

Modified: trunk/cmake/modules/plplot_functions.cmake
===================================================================
--- trunk/cmake/modules/plplot_functions.cmake	2012-11-18 20:31:09 UTC (rev 12276)
+++ trunk/cmake/modules/plplot_functions.cmake	2012-11-19 00:02:13 UTC (rev 12277)
@@ -54,6 +54,7 @@
   if(
       ${device} STREQUAL "png" OR
       ${device} STREQUAL "pngcairo" OR
+      ${device} STREQUAL "epscairo" OR
       ${device} STREQUAL "jpeg" OR
       ${device} STREQUAL "xfig" OR
       ${device} STREQUAL "svg" OR
@@ -72,6 +73,7 @@
   else(
       ${device} STREQUAL "png" OR
       ${device} STREQUAL "pngcairo" OR
+      ${device} STREQUAL "epscairo" OR
       ${device} STREQUAL "jpeg" OR
       ${device} STREQUAL "xfig" OR
       ${device} STREQUAL "svg" OR
@@ -90,6 +92,7 @@
   endif(
       ${device} STREQUAL "png" OR
       ${device} STREQUAL "pngcairo" OR
+      ${device} STREQUAL "epscairo" OR
       ${device} STREQUAL "jpeg" OR
       ${device} STREQUAL "xfig" OR
       ${device} STREQUAL "svg" OR

Modified: trunk/examples/CMakeLists.txt
===================================================================
--- trunk/examples/CMakeLists.txt	2012-11-18 20:31:09 UTC (rev 12276)
+++ trunk/examples/CMakeLists.txt	2012-11-19 00:02:13 UTC (rev 12277)
@@ -107,6 +107,10 @@
     set(PSCAIRO_COMMENT "#")
   endif(NOT PLD_pscairo)
 
+  if(NOT PLD_epscairo)
+    set(EPSCAIRO_COMMENT "#")
+  endif(NOT PLD_epscairo)
+
   if(NOT PLD_svgcairo)
     set(SVGCAIRO_COMMENT "#")
   endif(NOT PLD_svgcairo)
@@ -1037,6 +1041,7 @@
     test_c_pdfcairo
     test_c_pngcairo
     test_c_pscairo
+    test_c_epscairo
     test_c_svgcairo
     test_extcairo
     test_c_xcairo
@@ -1065,6 +1070,7 @@
 PLD_pdfcairo:		${PLD_pdfcairo}
 PLD_pngcairo:		${PLD_pngcairo}
 PLD_pscairo:		${PLD_pscairo}
+PLD_epscairo:		${PLD_epscairo}
 PLD_svgcairo:		${PLD_svgcairo}
 PLD_cgm:		${PLD_cgm}
 PLD_dg300:		${PLD_dg300}

Modified: trunk/plplot_test/plplot-test.sh.cmake
===================================================================
--- trunk/plplot_test/plplot-test.sh.cmake	2012-11-18 20:31:09 UTC (rev 12276)
+++ trunk/plplot_test/plplot-test.sh.cmake	2012-11-19 00:02:13 UTC (rev 12277)
@@ -356,7 +356,7 @@
 
 # Some devices require special options others do not.
 case "$device" in
-   png|pngcairo|jpeg|xfig|svg|svgcairo|bmpqt|jpgqt|pngqt|ppmqt|tiffqt|svgqt|epsqt|pdfqt)
+   png|pngcairo|epscairo|jpeg|xfig|svg|svgcairo|bmpqt|jpgqt|pngqt|ppmqt|tiffqt|svgqt|epsqt|pdfqt)
       options="-fam -fflen 2"
       ;;
    gif)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.