|
From: <ai...@us...> - 2011-11-26 02:42:22
|
Revision: 12048
http://plplot.svn.sourceforge.net/plplot/?rev=12048&view=rev
Author: airwin
Date: 2011-11-26 02:42:16 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
OCaml building is complicated so stick with what has worked before
(including setting of PC_REQUIRES_TAG to the transitive linking
value for the pkg-config case) and ignore the NON_TRANSITIVE option
altogether.
Modified Paths:
--------------
trunk/bindings/ocaml/CMakeLists.txt
Modified: trunk/bindings/ocaml/CMakeLists.txt
===================================================================
--- trunk/bindings/ocaml/CMakeLists.txt 2011-11-26 02:20:29 UTC (rev 12047)
+++ trunk/bindings/ocaml/CMakeLists.txt 2011-11-26 02:42:16 UTC (rev 12048)
@@ -297,6 +297,11 @@
configure_file(META.in ${CMAKE_CURRENT_BINARY_DIR}/META)
# Configure pkg-config *.pc file corresponding to plplot.cma
if(PKG_CONFIG_EXECUTABLE)
+ # This configures the pkg-config method to use transitive linking
+ # (since we don't really know how to deal with non-transitive
+ # linking for ocaml).
+ set(PC_REQUIRES_TAG "Requires")
+
if(LIB_TAG)
set(PC_PRECISION "double")
else(LIB_TAG)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|