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

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

Revision: 10415
          http://plplot.svn.sourceforge.net/plplot/?rev=10415&view=rev
Author:   airwin
Date:     2009-09-16 06:40:20 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
For OCAML_NEW_BUILD case, use correct (null) build subdirectory, and improve
linking of some of the build steps for the components of the ocaml bindings.
However, there are still build errors for the ocaml examples.  This time, the
error message involves undefined reference to camlidl_find_enum and other
OCaml library symbols.  So OCAML_NEW_BUILD defaults to OFF for now.

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-16 04:06:46 UTC (rev 10414)
+++ trunk/bindings/ocaml/CMakeLists.txt	2009-09-16 06:40:20 UTC (rev 10415)
@@ -22,7 +22,6 @@
 
 if(ENABLE_ocaml)
 
-  option(OCAML_NEW_BUILD "Try new detailed OCaml build method?" OFF)
   if(OCAML_NEW_BUILD)
 
     #Detailed CMake logic to build ocaml bindings for PLplot.
@@ -115,9 +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${CMAKE_CURRENT_BINARY_DIR} -cclib -lplplot_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot${LIB_TAG} -o ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo
-#      COMMAND ocamlc -verbose -a -custom -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${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 -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
       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-16 04:06:46 UTC (rev 10414)
+++ trunk/cmake/modules/ocaml.cmake	2009-09-16 06:40:20 UTC (rev 10415)
@@ -95,7 +95,12 @@
   endif(CAMLIDL_LIB_DIR)
   
   # Subdirectory for ocamlbuild to use for build
-  set(OCAML_BUILD_DIR _build CACHE PATH "Subdirectory to use for ocamlbuild")
+  option(OCAML_NEW_BUILD "Try new detailed OCaml build method?" OFF)
+  if(OCAML_NEW_BUILD)
+    set(OCAML_BUILD_DIR "" CACHE PATH "Subdirectory to use for ocamlbuild")
+  else(OCAML_NEW_BUILD)
+    set(OCAML_BUILD_DIR _build CACHE PATH "Subdirectory to use for ocamlbuild")
+  endif(OCAML_NEW_BUILD)
   
   # Installation follows the Debian ocaml policy for want of a better
   # standard.


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