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

[<hez...@us...>]

Revision: 12310
          http://sourceforge.net/p/plplot/code/12310
Author:   hezekiahcarty
Date:     2013-04-28 17:37:01 +0000 (Sun, 28 Apr 2013)
Log Message:
-----------
Add support for camlidl (and therefore OCaml) installed via opam

This requires findlib which most OCaml users should have.

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

Modified: trunk/bindings/ocaml/CMakeLists.txt
===================================================================
--- trunk/bindings/ocaml/CMakeLists.txt	2013-04-26 22:43:53 UTC (rev 12309)
+++ trunk/bindings/ocaml/CMakeLists.txt	2013-04-28 17:37:01 UTC (rev 12310)
@@ -100,8 +100,8 @@
     ${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 -ccopt -I${CMAKE_BINARY_DIR} -ccopt -DHAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c
+    COMMAND ${OCAMLC} -ccopt -I${CAMLIDL_LIB_DIR} -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 -ccopt -I${CMAKE_BINARY_DIR} -ccopt -I${CAMLIDL_LIB_DIR} -ccopt -DHAVE_CONFIG_H -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 ${ocaml_STATIC_FLAGS}
     DEPENDS
     ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c

Modified: trunk/cmake/modules/ocaml.cmake
===================================================================
--- trunk/cmake/modules/ocaml.cmake	2013-04-26 22:43:53 UTC (rev 12309)
+++ trunk/cmake/modules/ocaml.cmake	2013-04-28 17:37:01 UTC (rev 12310)
@@ -119,7 +119,15 @@
     OUTPUT_STRIP_TRAILING_WHITESPACE
     )
   message(STATUS "OCAML_LIB_PATH = ${OCAML_LIB_PATH}")
-  find_path(CAMLIDL_LIB_DIR libcamlidl.a PATHS ${OCAML_LIB_PATH} )
+  if(OCAMLFIND)
+    execute_process(COMMAND ${OCAMLFIND} query camlidl
+      OUTPUT_VARIABLE CAMLIDL_LIB_PATH
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+    find_path(CAMLIDL_LIB_DIR libcamlidl.a PATHS ${CAMLIDL_LIB_PATH} ${OCAML_LIB_PATH} )
+  else(OCAMLFIND)
+    find_path(CAMLIDL_LIB_DIR libcamlidl.a PATHS ${OCAML_LIB_PATH} )
+  endif(OCAMLFIND)
   if(CAMLIDL_LIB_DIR)
     message(STATUS "CAMLIDL_LIB_DIR = ${CAMLIDL_LIB_DIR}")
   else(CAMLIDL_LIB_DIR)

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