|
From: <ai...@us...> - 2008-07-18 17:22:54
|
Revision: 8528
http://plplot.svn.sourceforge.net/plplot/?rev=8528&view=rev
Author: airwin
Date: 2008-07-18 17:23:01 +0000 (Fri, 18 Jul 2008)
Log Message:
-----------
Serialize two ocamlbuilds (which apparently interfere with each other)
and put in correct dependencies on libplplot so that
parallel build works.
Modified Paths:
--------------
trunk/bindings/ocaml/CMakeLists.txt
Modified: trunk/bindings/ocaml/CMakeLists.txt
===================================================================
--- trunk/bindings/ocaml/CMakeLists.txt 2008-07-18 01:45:06 UTC (rev 8527)
+++ trunk/bindings/ocaml/CMakeLists.txt 2008-07-18 17:23:01 UTC (rev 8528)
@@ -73,17 +73,22 @@
# Build bytecode version
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${OCAML_BUILD_DIR}/plplot.cma
- COMMAND ${OCAMLBUILD} -tag debug -classic-display -build-dir ${OCAML_BUILD_DIR} plplot.cma
- DEPENDS ${DEPENDS_LIST}
+ COMMAND ${OCAMLBUILD} -tag debug -classic-display
+ -build-dir ${OCAML_BUILD_DIR} plplot.cma
+ DEPENDS ${DEPENDS_LIST} plplot${LIB_TAG}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
- # Build native version
+ # Build native version. Use DEPENDS to serialize against plplot.cma
+ # since the two ocamlbuilds interfere with each other when in parallel
+ # build mode.
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${OCAML_BUILD_DIR}/plplot.cmxa
${CMAKE_CURRENT_BINARY_DIR}/${OCAML_BUILD_DIR}/plplot.a
- COMMAND ocamlbuild -tag debug -build-dir ${OCAML_BUILD_DIR} plplot.cmxa
- DEPENDS ${DEPENDS_LIST}
+ COMMAND ${OCAMLBUILD} -tag debug -classic-display
+ -build-dir ${OCAML_BUILD_DIR} plplot.cmxa
+ DEPENDS ${DEPENDS_LIST} plplot${LIB_TAG}
+ ${CMAKE_CURRENT_BINARY_DIR}/${OCAML_BUILD_DIR}/plplot.cma
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|