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

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

Revision: 9813
          http://plplot.svn.sourceforge.net/plplot/?rev=9813&view=rev
Author:   airwin
Date:     2009-04-17 16:58:19 +0000 (Fri, 17 Apr 2009)

Log Message:
-----------
AWI for Alban Rochel.  Set full list of moc options corresponding to all
PLD_xxx values associated with qt.  This fix should make a difference for
the case when defining only non-interactive raster devices.

Modified Paths:
--------------
    trunk/drivers/CMakeLists.txt
    trunk/src/CMakeLists.txt

Modified: trunk/drivers/CMakeLists.txt
===================================================================
--- trunk/drivers/CMakeLists.txt	2009-04-17 16:54:30 UTC (rev 9812)
+++ trunk/drivers/CMakeLists.txt	2009-04-17 16:58:19 UTC (rev 9813)
@@ -92,6 +92,30 @@
     endif(${SOURCE_ROOT_NAME}_COMPILE_FLAGS)
     if(SOURCE_ROOT_NAME STREQUAL "qt")
       set(MOC_OPTIONS)
+      if(PLD_bmpqt)
+	list(APPEND MOC_OPTIONS -DPLD_bmpqt)
+      endif(PLD_bmpqt)
+      if(PLD_jpgqt)
+	list(APPEND MOC_OPTIONS -DPLD_jpgqt)
+      endif(PLD_jpgqt)
+      if(PLD_pngqt)
+	list(APPEND MOC_OPTIONS -DPLD_pngqt)
+      endif(PLD_pngqt)
+      if(PLD_ppmqt)
+	list(APPEND MOC_OPTIONS -DPLD_ppmqt)
+      endif(PLD_ppmqt)
+      if(PLD_tiffqt)
+	list(APPEND MOC_OPTIONS -DPLD_tiffqt)
+      endif(PLD_tiffqt)
+      if(PLD_svgqt)
+	list(APPEND MOC_OPTIONS -DPLD_svgqt)
+      endif(PLD_svgqt)
+      if(PLD_epsqt)
+	list(APPEND MOC_OPTIONS -DPLD_epsqt)
+      endif(PLD_epsqt)
+      if(PLD_pdfqt)
+	list(APPEND MOC_OPTIONS -DPLD_pdfqt)
+      endif(PLD_pdfqt)
       if(PLD_qtwidget)
 	list(APPEND MOC_OPTIONS -DPLD_qtwidget)
       endif(PLD_qtwidget)

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2009-04-17 16:54:30 UTC (rev 9812)
+++ trunk/src/CMakeLists.txt	2009-04-17 16:58:19 UTC (rev 9813)
@@ -102,6 +102,30 @@
     list(APPEND plplot${LIB_TAG}_LIB_SRCS ${${SOURCE_ROOT_NAME}_SOURCE})
     if(SOURCE_ROOT_NAME STREQUAL "qt")
       set(MOC_OPTIONS)
+      if(PLD_bmpqt)
+	list(APPEND MOC_OPTIONS -DPLD_bmpqt)
+      endif(PLD_bmpqt)
+      if(PLD_jpgqt)
+	list(APPEND MOC_OPTIONS -DPLD_jpgqt)
+      endif(PLD_jpgqt)
+      if(PLD_pngqt)
+	list(APPEND MOC_OPTIONS -DPLD_pngqt)
+      endif(PLD_pngqt)
+      if(PLD_ppmqt)
+	list(APPEND MOC_OPTIONS -DPLD_ppmqt)
+      endif(PLD_ppmqt)
+      if(PLD_tiffqt)
+	list(APPEND MOC_OPTIONS -DPLD_tiffqt)
+      endif(PLD_tiffqt)
+      if(PLD_svgqt)
+	list(APPEND MOC_OPTIONS -DPLD_svgqt)
+      endif(PLD_svgqt)
+      if(PLD_epsqt)
+	list(APPEND MOC_OPTIONS -DPLD_epsqt)
+      endif(PLD_epsqt)
+      if(PLD_pdfqt)
+	list(APPEND MOC_OPTIONS -DPLD_pdfqt)
+      endif(PLD_pdfqt)
       if(PLD_qtwidget)
 	list(APPEND MOC_OPTIONS -DPLD_qtwidget)
       endif(PLD_qtwidget)


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