From: <hez...@us...> - 2009-09-18 20:02:54
|
Revision: 10426 http://plplot.svn.sourceforge.net/plplot/?rev=10426&view=rev Author: hezekiahcarty Date: 2009-09-18 20:02:45 +0000 (Fri, 18 Sep 2009) Log Message: ----------- Rearrange argument lists to make the new OCaml compilation scheme work properly OCaml is very sensitive to the order in which compiler arguments are provided, which was apparently causing linking errors for the OCaml PLplot bindings when using the new PLplot OCaml build system. Modified Paths: -------------- trunk/bindings/ocaml/CMakeLists.txt Modified: trunk/bindings/ocaml/CMakeLists.txt =================================================================== --- trunk/bindings/ocaml/CMakeLists.txt 2009-09-18 18:52:15 UTC (rev 10425) +++ trunk/bindings/ocaml/CMakeLists.txt 2009-09-18 20:02:45 UTC (rev 10426) @@ -49,9 +49,9 @@ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o ${CMAKE_CURRENT_BINARY_DIR}/dllplplot_stubs.so ${CMAKE_CURRENT_BINARY_DIR}/libplplot_stubs.a - COMMAND ocamlc -verbose -c ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c - COMMAND ocamlc -verbose -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -c ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c - COMMAND ocamlmklib -v -o plplot_stubs -L${CAMLIDL_LIB_DIR} -lcamlidl -L${CMAKE_BINARY_DIR}/src -dllpath ${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o ${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o + COMMAND ocamlc -c ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c + COMMAND ocamlc -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -c ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c + COMMAND ocamlmklib -o plplot_stubs -L${CAMLIDL_LIB_DIR} -lcamlidl -L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o ${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c @@ -69,10 +69,10 @@ ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmi ${CMAKE_CURRENT_BINARY_DIR}/plplot.mli ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmi - COMMAND ocamlc -verbose -c ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.mli + COMMAND ocamlc -c ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.mli # ocamlc *.mli source file must be in ${CMAKE_CURRENT_BINARY_DIR}. COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/plplot.mli ${CMAKE_CURRENT_BINARY_DIR}/plplot.mli - COMMAND ocamlc -verbose -c ${CMAKE_CURRENT_BINARY_DIR}/plplot.mli + COMMAND ocamlc -c ${CMAKE_CURRENT_BINARY_DIR}/plplot.mli DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.mli ${CMAKE_CURRENT_SOURCE_DIR}/plplot.mli @@ -91,13 +91,13 @@ ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmx ${CMAKE_CURRENT_BINARY_DIR}/plplot.o - COMMAND ocamlc -verbose -c ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.ml - COMMAND ocamlopt -verbose -c ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.ml + COMMAND ocamlc -c ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.ml + COMMAND ocamlopt -c ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.ml # ocamlc and ocamlopt *.ml source file must be in # ${CMAKE_CURRENT_BINARY_DIR}. COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/plplot.ml ${CMAKE_CURRENT_BINARY_DIR}/plplot.ml - COMMAND ocamlc -verbose -c ${CMAKE_CURRENT_BINARY_DIR}/plplot.ml - COMMAND ocamlopt -verbose -c ${CMAKE_CURRENT_BINARY_DIR}/plplot.ml + COMMAND ocamlc -c ${CMAKE_CURRENT_BINARY_DIR}/plplot.ml + COMMAND ocamlopt -c ${CMAKE_CURRENT_BINARY_DIR}/plplot.ml DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.ml ${CMAKE_CURRENT_SOURCE_DIR}/plplot.ml @@ -114,8 +114,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmxa ${CMAKE_CURRENT_BINARY_DIR}/plplot.a - COMMAND ocamlc -verbose -a -custom -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplplot_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot${LIB_TAG} -dllpath ${CMAKE_BINARY_DIR}/src -o ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo - COMMAND ocamlopt -verbose -a -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplplot_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot${LIB_TAG} -o ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmxa ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmx ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmx + COMMAND ocamlc -a -custom -o ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo -dllib -lplplot_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot${LIB_TAG} -dllpath ${CMAKE_BINARY_DIR}/src + COMMAND ocamlopt -a -o ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmxa ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmx ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmx -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot${LIB_TAG} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |