plplot-cvs

[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.

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

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

Revision: 13112
          http://sourceforge.net/p/plplot/code/13112
Author:   airwin
Date:     2014-04-26 02:43:54 +0000 (Sat, 26 Apr 2014)
Log Message:
-----------
Drop dependence on libagg since the location of the tarball is still
not settled, and libagg is only needed for one component of the
wxwidgets device driver which is scheduled to be dropped in any case.

Change plplot dependence from qt4_lite to qt5_lite and exclusively use
Qt5 for plplot epa_build and tests.

The epa_build of qt5_lite and the epa_build and test of PLplot
were comprehensively tested (all three build systems all three major
configurations) on Linux with no issues.

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-04-26 02:38:37 UTC (rev 13111)
+++ trunk/cmake/epa_build/plplot/CMakeLists.txt	2014-04-26 02:43:54 UTC (rev 13112)
@@ -2,7 +2,7 @@
 
 # Configure the build of PLplot.
 
-# Copyright (C) 2013 Alan W. Irwin
+# Copyright (C) 2013-2014 Alan W. Irwin
 
 # This file is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -25,7 +25,10 @@
 set(ignored_dependencies_LIST ${extra_ignored_dependencies_list})
 
 set(dependencies_LIST
-  libagg
+  # agg website now (2014-04-13) a broken link, and this library only
+  # needed in any case for a purpose that may disappear (wxwidgets).
+  # So drop it.
+  #libagg
   libharu
   libqhull
   shapelib
@@ -38,7 +41,7 @@
 if(NOT MSYS_PLATFORM)
   list(APPEND dependencies_LIST
     pango
-    qt4_lite
+    qt5_lite
     )
 endif(NOT MSYS_PLATFORM)
 
@@ -71,9 +74,14 @@
   -DDROP_GTK_PLUS_2_BUILDS=ON
   )
 
+# Only use Qt5 since that is all that is epa_built.
+list(APPEND cmake_args
+  -DPLPLOT_USE_QT5=ON
+  )
+
 if(MSYS_PLATFORM)
   # Turn off the cairo and qt device drivers for plplot on Windows
-  # until the pango and qt4_lite packages and all their dependencies
+  # until the pango and qt5_lite packages and all their dependencies
   # build properly on that platform
   list(APPEND cmake_args
     -DDEFAULT_NO_CAIRO_DEVICES:BOOL=ON

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