[Plplot-cvs] SF.net SVN: plplot:[11455] trunk/bindings/octave/CMakeLists.txt

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

Revision: 11455
          http://plplot.svn.sourceforge.net/plplot/?rev=11455&view=rev
Author:   airwin
Date:     2011-01-08 17:01:54 +0000 (Sat, 08 Jan 2011)

Log Message:
-----------
Use vastly updated global symbol results in
bindings/octave/plplot_octave_def to help generate plplot_stub.m for
the (default) ENABLE_swig_octave=ON case.  This change means when the
global command for these symbols is used within functions (e.g.,
x33c.m), the correct PLplot values (taken here from plplot_octave_def,
but that was generated from the #defines in
bindings/swig-support/plplotcapi.i) will be used for these symbols.

Modified Paths:
--------------
    trunk/bindings/octave/CMakeLists.txt

Modified: trunk/bindings/octave/CMakeLists.txt
===================================================================
--- trunk/bindings/octave/CMakeLists.txt	2011-01-08 16:38:26 UTC (rev 11454)
+++ trunk/bindings/octave/CMakeLists.txt	2011-01-08 17:01:54 UTC (rev 11455)
@@ -123,13 +123,17 @@
 
   if(ENABLE_swig_octave)
 
+    # Order matters here; plplot_oct_def (which contains all the
+    # global commands must occur first.
     add_custom_command(
       OUTPUT 
       ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different 
+      COMMAND cat 
+      ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_def
       ${CMAKE_CURRENT_SOURCE_DIR}/plplot_stub_hand_crafted.m
-      ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
+      > ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
       DEPENDS
+      ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_def
       ${CMAKE_CURRENT_SOURCE_DIR}/plplot_stub_hand_crafted.m
       )
 


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