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

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

Revision: 10446
          http://plplot.svn.sourceforge.net/plplot/?rev=10446&view=rev
Author:   airwin
Date:     2009-09-21 06:30:05 +0000 (Mon, 21 Sep 2009)

Log Message:
-----------
Take advantage of new fullpath capabilities of touchup.ml to simplify
add_custom_command that generates generated_plplot_h.inc.

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

Modified: trunk/bindings/ocaml/CMakeLists.txt
===================================================================
--- trunk/bindings/ocaml/CMakeLists.txt	2009-09-21 02:35:09 UTC (rev 10445)
+++ trunk/bindings/ocaml/CMakeLists.txt	2009-09-21 06:30:05 UTC (rev 10446)
@@ -25,20 +25,13 @@
   # optional command to generate generated_plplot_h.inc.  This generated
   # version of the file should be identical to plplot_h.inc.
   if(GENERATE_PLPLOT_H_INC)
-    # N.B. remove the first OUTPUT file and all the copy_if_different and
-    # remove commands once touchup.ml is changed to have multi-directory
-    # capability.
     add_custom_command(
       OUTPUT 
-      ${CMAKE_CURRENT_BINARY_DIR}/plplot_h
       ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/plplot_h ${CMAKE_CURRENT_BINARY_DIR}/plplot_h
-      COMMAND ${OCAML} ${CMAKE_CURRENT_SOURCE_DIR}/touchup.ml
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/plplot_h.inc ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
-      COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/plplot_h.inc
+      COMMAND ${OCAML} ${CMAKE_CURRENT_SOURCE_DIR}/touchup.ml ${CMAKE_CURRENT_SOURCE_DIR}/plplot_h ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
       DEPENDS
-      ${CMAKE_CURRENT_SOURCE_DIR}/plplot_h
       ${CMAKE_CURRENT_SOURCE_DIR}/touchup.ml
+      ${CMAKE_CURRENT_SOURCE_DIR}/plplot_h
       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
       )
     add_custom_target(generate_plplot_h.inc


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