[Plplot-cvs] SF.net SVN: plplot:[10441] trunk

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

Revision: 10441
          http://plplot.svn.sourceforge.net/plplot/?rev=10441&view=rev
Author:   airwin
Date:     2009-09-20 20:26:41 +0000 (Sun, 20 Sep 2009)

Log Message:
-----------
Use symbolic names for all ocaml commands.

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

Modified: trunk/bindings/ocaml/CMakeLists.txt
===================================================================
--- trunk/bindings/ocaml/CMakeLists.txt	2009-09-20 19:23:02 UTC (rev 10440)
+++ trunk/bindings/ocaml/CMakeLists.txt	2009-09-20 20:26:41 UTC (rev 10441)
@@ -36,7 +36,7 @@
     ${camlidl_GENERATED_SOURCE}
     # camlidl source file must be in ${CMAKE_CURRENT_BINARY_DIR}. 
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/plplot_core.idl ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.idl
-    COMMAND camlidl -header -I ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.idl
+    COMMAND ${CAMLIDL} -header -I ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.idl
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/plplot_core.idl
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
@@ -47,9 +47,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 -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
+    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
@@ -67,10 +67,10 @@
     ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmi
     ${CMAKE_CURRENT_BINARY_DIR}/plplot.mli
     ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmi
-    COMMAND ocamlc -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 -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
@@ -89,13 +89,13 @@
     ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo
     ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmx
     ${CMAKE_CURRENT_BINARY_DIR}/plplot.o
-    COMMAND ocamlc -c ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.ml
-    COMMAND ocamlopt -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 -c ${CMAKE_CURRENT_BINARY_DIR}/plplot.ml
-    COMMAND ocamlopt -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
@@ -112,8 +112,8 @@
     ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma
     ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmxa
     ${CMAKE_CURRENT_BINARY_DIR}/plplot.a
-    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}
+    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

Modified: trunk/cmake/modules/ocaml.cmake
===================================================================
--- trunk/cmake/modules/ocaml.cmake	2009-09-20 19:23:02 UTC (rev 10440)
+++ trunk/cmake/modules/ocaml.cmake	2009-09-20 20:26:41 UTC (rev 10441)
@@ -32,28 +32,6 @@
 endif(ENABLE_ocaml AND NOT BUILD_SHARED_LIBS)
 
 if(ENABLE_ocaml)
-  find_program(OCAMLBUILD ocamlbuild)
-  if (OCAMLBUILD)
-    message(STATUS "OCAMLBUILD = ${OCAMLBUILD}")
-  else (OCAMLBUILD)
-    message(STATUS "WARNING: "
-      "ocamlbuild not found. Disabling ocaml bindings")
-    set(ENABLE_ocaml OFF CACHE BOOL "Enable OCaml bindings" FORCE)
-  endif (OCAMLBUILD)
-endif(ENABLE_ocaml)
-
-if(ENABLE_ocaml)
-  find_program(OCAMLFIND ocamlfind)
-  if (OCAMLFIND)
-    message(STATUS "OCAMLFIND = ${OCAMLFIND}")
-  else (OCAMLFIND)
-    message(STATUS "WARNING:"
-      "ocamlfind not found. Disabling ocaml bindings")
-    set(ENABLE_ocaml OFF CACHE BOOL "Enable OCaml bindings" FORCE)
-  endif (OCAMLFIND)
-endif(ENABLE_ocaml)
-
-if(ENABLE_ocaml)
   find_program(OCAMLC ocamlc)
   if (OCAMLC)
     message(STATUS "OCAMLC = ${OCAMLC}")
@@ -76,6 +54,28 @@
 endif(ENABLE_ocaml)
 
 if(ENABLE_ocaml)
+  find_program(OCAMLMKLIB ocamlmklib)
+  if (OCAMLMKLIB)
+    message(STATUS "OCAMLMKLIB = ${OCAMLMKLIB}")
+  else (OCAMLMKLIB)
+    message(STATUS "WARNING:"
+      "ocamlmklib not found. Disabling ocaml bindings")
+    set(ENABLE_ocaml OFF CACHE BOOL "Enable OCaml bindings" FORCE)
+  endif (OCAMLMKLIB)
+endif(ENABLE_ocaml)
+
+if(ENABLE_ocaml)
+  find_program(OCAMLOPT ocamlopt)
+  if (OCAMLOPT)
+    message(STATUS "OCAMLOPT = ${OCAMLOPT}")
+  else (OCAMLOPT)
+    message(STATUS "WARNING:"
+      "ocamlopt not found. Disabling ocaml bindings")
+    set(ENABLE_ocaml OFF CACHE BOOL "Enable OCaml bindings" FORCE)
+  endif (OCAMLOPT)
+endif(ENABLE_ocaml)
+
+if(ENABLE_ocaml)
   execute_process(COMMAND ${OCAMLC} -version
     OUTPUT_VARIABLE OCAML_VERSION
     OUTPUT_STRIP_TRAILING_WHITESPACE


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