[Plplot-cvs] SF.net SVN: plplot:[13083] trunk/cmake/epa_build

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

Revision: 13083
          http://sourceforge.net/p/plplot/code/13083
Author:   airwin
Date:     2014-03-18 03:13:46 +0000 (Tue, 18 Mar 2014)
Log Message:
-----------
Disable the octave binding for both plplot and plplot_lite.  There is
no epa_build of octave yet.  Furthermore, non-epa_built versions of
octave will have many dependencies that are likely to clash with the
versions of the other PLplot dependencies that are epa_built.

For the plplot (as opposed to plplot_lite) case on the Windows platform
exclude the pango and qt4_lite dependencies and disable the
corresponding PLplot capabilities because pango, qt4_lite, and all
their dependent packages do not epa_build correctly yet on Windows.

Thus, on Windows the only difference between plplot and plplot_lite
at the moment is the former has a dependency on the wxwidgets epa_build
and allows the corresponding wxwidgets device driver to be built
and tested.

On Unix, the differences between plplot and plplot_lite are larger;
the former has a dependency on wxwidgets, pango, and qt4_lite
and allows the corresponding PLplot capabilities to be built
and tested.

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

Modified: trunk/cmake/epa_build/plplot/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot/CMakeLists.txt	2014-03-18 02:55:19 UTC (rev 13082)
+++ trunk/cmake/epa_build/plplot/CMakeLists.txt	2014-03-18 03:13:46 UTC (rev 13083)
@@ -29,11 +29,20 @@
   libharu
   libqhull
   shapelib
-  pango
-  qt4_lite
   wxwidgets
   )
 
+# For now only add in these dependencies for the Unix case because
+# these epa_builds do not yet work on Windows.
+
+if(NOT MSYS_PLATFORM)
+  list(APPEND dependencies_LIST
+    pango
+    qt4_lite
+    )
+endif(NOT MSYS_PLATFORM)
+
+
 # Do boilerplate tasks that must be done for each different project
 # that is configured as part of epa_build.
 epa_boilerplate(
@@ -49,12 +58,23 @@
 set(CXXFLAGS "$ENV{CXXFLAGS}")
 set(FFLAGS "$ENV{FFLAGS}")
 
-# 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)
+# Disable the octave binding for PLplot.  There is no epa_build of
+# octave yet.  Furthermore, non-epa_built versions of octave will have
+# many dependencies that are likely to clash with the versions of the
+# other PLplot dependencies that are epa_built.
+set(cmake_args -DENABLE_octave=OFF)
 
+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
+  # build properly on that platform
+  list(APPEND cmake_args
+    -DDEFAULT_NO_CAIRO_DEVICES:BOOL=ON
+    -DDEFAULT_NO_QT_DEVICES:BOOL=ON
+    -DENABLE_qt=OFF
+    )
+endif(MSYS_PLATFORM)
+
 # Assumption that the top-level local PLplot source tree is two directories
 # up from the present top-level directory for epa_build.
 # This assumption is correct if you are accessing epa_build as

Modified: trunk/cmake/epa_build/plplot_lite/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot_lite/CMakeLists.txt	2014-03-18 02:55:19 UTC (rev 13082)
+++ trunk/cmake/epa_build/plplot_lite/CMakeLists.txt	2014-03-18 03:13:46 UTC (rev 13083)
@@ -47,8 +47,14 @@
 set(CXXFLAGS "$ENV{CXXFLAGS}")
 set(FFLAGS "$ENV{FFLAGS}")
 
-# Turn off wxwidgets, cairo, and qt for plplot_lite.
-set(cmake_args
+# Disable the octave binding for PLplot.  There is no epa_build of
+# octave yet.  Furthermore, non-epa_built versions of octave will have
+# many dependencies that are likely to clash with the versions of the
+# other PLplot dependencies that are epa_built.
+set(cmake_args -DENABLE_octave=OFF)
+
+# In addition turn off wxwidgets, cairo, and qt for plplot_lite.
+list(APPEND cmake_args
   -DPLD_wxwidgets=OFF
   -DENABLE_wxwidgets=OFF
   -DDEFAULT_NO_CAIRO_DEVICES:BOOL=ON

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