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

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

Revision: 11098
          http://plplot.svn.sourceforge.net/plplot/?rev=11098&view=rev
Author:   airwin
Date:     2010-07-23 05:07:44 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
Move gcw_true and gcw_false determination from gcw.cmake (where it was
bypassed since the gcw device has been retired) to
examples/c/CMakeLists.txt so that examples/c/Makefile(.examples.in)
will be properly configured.  This change corrects a long-standing
(introduced prior to 5.9.6 by the retirement of the gcw device driver)
bug in the traditional Makefile+pkg-config approach to building and
testing the installed examples.

Modified Paths:
--------------
    trunk/cmake/modules/gcw.cmake
    trunk/examples/c/CMakeLists.txt

Modified: trunk/cmake/modules/gcw.cmake
===================================================================
--- trunk/cmake/modules/gcw.cmake	2010-07-22 17:38:46 UTC (rev 11097)
+++ trunk/cmake/modules/gcw.cmake	2010-07-23 05:07:44 UTC (rev 11098)
@@ -124,14 +124,6 @@
   set(ENABLE_pygcw OFF CACHE BOOL "Enable Python Gnome2 bindings" FORCE)
 endif(ENABLE_pygcw AND NOT PLD_gcw)
 
-if(ENABLE_gnome2)
-  set(gcw_true "")
-  set(gcw_false "#")
-else(ENABLE_gnome2)
-  set(gcw_true "#")
-  set(gcw_false "")
-endif(ENABLE_gnome2)
-
 if(PLD_gcw)
   if(ENABLE_DYNDRIVERS)
     if(ENABLE_gnome2)

Modified: trunk/examples/c/CMakeLists.txt
===================================================================
--- trunk/examples/c/CMakeLists.txt	2010-07-22 17:38:46 UTC (rev 11097)
+++ trunk/examples/c/CMakeLists.txt	2010-07-23 05:07:44 UTC (rev 11098)
@@ -90,6 +90,11 @@
     set(plplotcanvas_DOCS
       README.plplotcanvas
       )
+    set(gcw_true "")
+    set(gcw_false "#")
+  else(ENABLE_gnome2)
+    set(gcw_true "#")
+    set(gcw_false "")
   endif(ENABLE_gnome2)
 
   install(FILES ${c_SRCS} ${plplotcanvas_SRCS} ${plplotcanvas_DOCS} ${extXdrawable_SRC} ${extcairo_SRC} ${cairo_DOCS}


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