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

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

Revision: 10527
          http://plplot.svn.sourceforge.net/plplot/?rev=10527&view=rev
Author:   airwin
Date:     2009-10-12 17:42:06 +0000 (Mon, 12 Oct 2009)

Log Message:
-----------
Fix build of OCaml documentation.  Note, similar changes need to be
made to ocaml/plcairo/CMakeLists.txt which I leave to Hez.

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

Modified: trunk/bindings/ocaml/CMakeLists.txt
===================================================================
--- trunk/bindings/ocaml/CMakeLists.txt	2009-10-12 04:08:02 UTC (rev 10526)
+++ trunk/bindings/ocaml/CMakeLists.txt	2009-10-12 17:42:06 UTC (rev 10527)
@@ -222,34 +222,47 @@
       )
   endif(OCAMLOPT)
 
-  if(OCAMLDOC AND BUILD_DOC)
+  if(OCAMLDOC)
     # Build OCaml API reference documentation
     set(OCAMLDOC_FILE_LIST
-      index_attributes.html index_modules.html Plplot.Plot.html
-      index_classes.html index_module_types.html Plplot.Quick_plot.html
-      index_class_types.html index_types.html style.css
-      index_exceptions.html index_values.html type_Plplot.html
-      index.html Plplot.html type_Plplot.Plot.html
-      index_methods.html plplot.mli type_Plplot.Quick_plot.html
+      Plplot.Plot.html
+      Plplot.Quick_plot.html
+      Plplot.html
+      index.html
+      index_attributes.html
+      index_class_types.html
+      index_classes.html
+      index_exceptions.html
+      index_methods.html
+      index_module_types.html
+      index_modules.html
+      index_types.html
+      index_values.html
+      style.css
+      type_Plplot.Plot.html
+      type_Plplot.Quick_plot.html
+      type_Plplot.html
       )
+
     set(OCAMLDOC_FILES)
     foreach(html_file ${OCAMLDOC_FILE_LIST})
-      list(APPEND ${OCAMLDOC_FILES} ${CMAKE_CURRENT_BINARY_DIR}/${html_file})
+      list(APPEND OCAMLDOC_FILES ${CMAKE_CURRENT_BINARY_DIR}/${html_file})
     endforeach(html_file ${OCAMLDOC_FILE_LIST})
     # ocamldoc builds the module's documentation using specially formatted
     # comments in the source file.
     add_custom_command(
-      OUTPUT "${OCAMLDOC_FILES}"
+      OUTPUT ${OCAMLDOC_FILES}
       COMMAND ${OCAMLDOC} -html ${CMAKE_CURRENT_SOURCE_DIR}/plplot.mli
       DEPENDS
       ${CMAKE_CURRENT_BINARY_DIR}/plplot.mli
       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
       )
-    add_custom_target(target_plplot_doc
-      DEPENDS
-      ${CMAKE_CURRENT_SOURCE_DIR}/plplot.mli
-      )
-  endif(OCAMLDOC AND BUILD_DOC)
+    add_custom_target(target_build_ocaml_doc DEPENDS ${OCAMLDOC_FILES})
+    # associated custom command has common file depends with custom command
+    # that is associated with target_plplot_cmi.  Therefore must serialize
+    # the two custom targets.
+    add_dependencies(target_plplot_cmi target_build_ocaml_doc)
+  endif(OCAMLDOC)
 
   # Basic build done, now trying to finish up by adapting bits
   # and pieces of old build procedure below.


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