[Plplot-cvs] SF.net SVN: plplot:[13080] trunk/cmake/epa_build/plplot/CMakeLists.txt

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

Revision: 13080
          http://sourceforge.net/p/plplot/code/13080
Author:   airwin
Date:     2014-03-17 04:50:38 +0000 (Mon, 17 Mar 2014)
Log Message:
-----------
Let plplot build using the wxwidgets device driver which was
problematic before in the epa_build case because previously
the epa_build of wxwidgets depended on a bad mixture of pango/cairo from
gtk+3 stack and the rest of the gtk+2 stack from the Linux system.

The resulting wxwidgets device driver  builds find, and mostly runs fine as well (see further
discussions about that on list).

Modified Paths:
--------------
    trunk/cmake/epa_build/plplot/CMakeLists.txt

Modified: trunk/cmake/epa_build/plplot/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot/CMakeLists.txt	2014-03-17 04:46:07 UTC (rev 13079)
+++ trunk/cmake/epa_build/plplot/CMakeLists.txt	2014-03-17 04:50:38 UTC (rev 13080)
@@ -31,6 +31,7 @@
   shapelib
   pango
   qt4_lite
+  wxwidgets
   )
 
 # Do boilerplate tasks that must be done for each different project
@@ -48,14 +49,11 @@
 set(CXXFLAGS "$ENV{CXXFLAGS}")
 set(FFLAGS "$ENV{FFLAGS}")
 
-# Leave everything ON by default for plplot.
-# Except for turning off all wxwidgets dependencies temporarily because
-# of mixed linking issues until epa_build implements build configurations
-# for a consistent stack of libraries for all of gtk.
-set(cmake_args
-  -DPLD_wxwidgets=OFF
-  -DENABLE_wxwidgets=OFF
-  )
+# Leave everything ON by default for plplot.  Since octave currently
+# (and for a long time into the future) does not have an epa_build
+# configuration for octave, the system version of octave will be
+# used if it exists.
+set(cmake_args)
 
 # Assumption that the top-level local PLplot source tree is two directories
 # up from the present top-level directory for epa_build.

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