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

[<hez...@us...>]

Revision: 10487
          http://plplot.svn.sourceforge.net/plplot/?rev=10487&view=rev
Author:   hezekiahcarty
Date:     2009-09-29 05:32:56 +0000 (Tue, 29 Sep 2009)

Log Message:
-----------
Always prepare the OCaml META file if the OCaml bindings are built

Configuring META should not depend on pkg-config.  This also has a small,
unrelated comment update.

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

Modified: trunk/bindings/ocaml/CMakeLists.txt
===================================================================
--- trunk/bindings/ocaml/CMakeLists.txt	2009-09-28 16:27:28 UTC (rev 10486)
+++ trunk/bindings/ocaml/CMakeLists.txt	2009-09-29 05:32:56 UTC (rev 10487)
@@ -50,6 +50,7 @@
     ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c
     )
 
+  # camlidl produces most of the C and OCaml code required to bind PLplot
   add_custom_command(
     OUTPUT
     ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.idl
@@ -222,6 +223,7 @@
   # and pieces of old build procedure below.
 
   # Configure the META file
+  configure_file(META.cmake ${CMAKE_CURRENT_BINARY_DIR}/META)
   # Configure pkg-config *.pc file corresponding to plplot.cma
   if(PKG_CONFIG_EXECUTABLE)
     if(LIB_TAG)
@@ -263,7 +265,6 @@
       @ONLY
       )
     install(FILES ${PC_CONFIGURED_FILE} DESTINATION ${PKG_CONFIG_DIR})
-    configure_file(META.cmake ${CMAKE_CURRENT_BINARY_DIR}/META)
   endif(PKG_CONFIG_EXECUTABLE)
 
   set(OCAML_FULL_INSTALL_FILES


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