[Plplot-cvs] SF.net SVN: plplot:[9181] trunk/cmake/modules

[<sm...@us...>]

Revision: 9181
          http://plplot.svn.sourceforge.net/plplot/?rev=9181&view=rev
Author:   smekal
Date:     2008-12-18 08:28:58 +0000 (Thu, 18 Dec 2008)

Log Message:
-----------
Add the wxpng device which is turned OFF by default in the moment.

Modified Paths:
--------------
    trunk/cmake/modules/drivers-init.cmake
    trunk/cmake/modules/wxwidgets.cmake

Modified: trunk/cmake/modules/drivers-init.cmake
===================================================================
--- trunk/cmake/modules/drivers-init.cmake	2008-12-18 08:13:40 UTC (rev 9180)
+++ trunk/cmake/modules/drivers-init.cmake	2008-12-18 08:28:58 UTC (rev 9181)
@@ -127,6 +127,7 @@
 "tkwin:tkwin:ON"
 "wingcc:wingcc:ON"
 "wxwidgets:wxwidgets:ON"
+"wxpng:wxwidgets:OFF"
 "xfig:xfig:ON"
 "xwin:xwin:ON"
 )

Modified: trunk/cmake/modules/wxwidgets.cmake
===================================================================
--- trunk/cmake/modules/wxwidgets.cmake	2008-12-18 08:13:40 UTC (rev 9180)
+++ trunk/cmake/modules/wxwidgets.cmake	2008-12-18 08:28:58 UTC (rev 9181)
@@ -29,7 +29,10 @@
 # 			    when ENABLE_DYNDRIVERS OFF.
 
 # Find wxWidgets needed for driver and bindings
-if(PLD_wxwidgets)
+if(
+   PLD_wxwidgets
+OR PLD_wxpng
+)
   find_package(wxWidgets QUIET)
   if(NOT wxWidgets_FOUND)
     message(STATUS
@@ -37,13 +40,20 @@
     "setting PLD_wxwidgets to OFF."
     )
     set(PLD_wxwidgets OFF CACHE BOOL "Enable wxwidgets device" FORCE)
+    set(PLD_wxpng OFF CACHE BOOL "Enable wxwidgets png device" FORCE)
   else(NOT wxWidgets_FOUND)  
 		# Check if stdint.h can be used from c++ (HAVE_CXX_STDINT_H)
 		include(TestForStdintCXX)
   endif(NOT wxWidgets_FOUND)  
-endif(PLD_wxwidgets)
+endif(
+   PLD_wxwidgets
+OR PLD_wxpng
+)
 
-if(PLD_wxwidgets)
+if(
+   PLD_wxwidgets
+OR PLD_wxpng
+)
   string(REGEX REPLACE ";" " -I" 
   wxwidgets_COMPILE_FLAGS
   "-I${wxWidgets_INCLUDE_DIRS}"
@@ -84,7 +94,10 @@
   ${DRIVERS_LINK_FLAGS} 
   ${wxwidgets_LINK_FLAGS}
   )
-endif(PLD_wxwidgets)
+endif(
+   PLD_wxwidgets
+OR PLD_wxpng
+)
 
 if(DEFAULT_NO_BINDINGS)
   option(ENABLE_wxwidgets "Enable wxwidgets bindings" OFF)


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