swt2c / rpms / plplot

Forked from rpms/plplot 2 years ago
Clone
Blob Blame History Raw
diff -up plplot-5.13.0/bindings/ocaml/CMakeLists.txt.ocaml plplot-5.13.0/bindings/ocaml/CMakeLists.txt
--- plplot-5.13.0/bindings/ocaml/CMakeLists.txt.ocaml	2018-07-22 09:58:45.264561944 -0600
+++ plplot-5.13.0/bindings/ocaml/CMakeLists.txt	2018-07-22 10:01:22.605626462 -0600
@@ -313,11 +313,11 @@ if(ENABLE_ocaml)
     ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo
     )
 
-  # ocamlc -a -custom builds a *.cma library from *.cmo
+  # ocamlc -a builds a *.cma library from *.cmo
   add_custom_command(
     OUTPUT
     ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma
-    COMMAND ${OCAMLC} -a -custom -o plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${ocaml_LIBRARIES_FLAGS}
+    COMMAND ${OCAMLC} -a -o plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${ocaml_LIBRARIES_FLAGS}
     DEPENDS
     ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo
     ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo
@@ -328,7 +328,7 @@ if(ENABLE_ocaml)
   add_custom_command(
     OUTPUT
     ${CMAKE_CURRENT_BINARY_DIR}/installed_plplot.cma
-    COMMAND ${OCAMLC} -a -custom -o installed_plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${installed_ocaml_LIBRARIES_FLAGS}
+    COMMAND ${OCAMLC} -a -o installed_plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${installed_ocaml_LIBRARIES_FLAGS}
     DEPENDS
     ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo
     ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo
diff -up plplot-5.13.0/bindings/ocaml/plcairo/CMakeLists.txt.ocaml plplot-5.13.0/bindings/ocaml/plcairo/CMakeLists.txt
--- plplot-5.13.0/bindings/ocaml/plcairo/CMakeLists.txt.ocaml	2017-08-25 20:43:25.000000000 -0600
+++ plplot-5.13.0/bindings/ocaml/plcairo/CMakeLists.txt	2018-07-22 09:58:45.265561964 -0600
@@ -84,11 +84,11 @@ if(ENABLE_ocaml AND OCAML_HAS_CAIRO)
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo
     )
 
-  # ocamlc -a -custom builds a *.cma library from *.cmo
+  # ocamlc -a builds a *.cma library from *.cmo
   add_custom_command(
     OUTPUT
     ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma
-    COMMAND ${OCAMLC} -a -custom -o ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -I ${PATH_TO_PLPLOT_CMA} plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo -dllib -lplcairo_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplcairo_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot -dllpath ${CMAKE_BINARY_DIR}/src
+    COMMAND ${OCAMLC} -a -o ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -I ${PATH_TO_PLPLOT_CMA} plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo -dllib -lplcairo_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplcairo_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot -dllpath ${CMAKE_BINARY_DIR}/src
     DEPENDS
     ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}