|
From: <ai...@us...> - 2011-10-08 23:32:03
|
Revision: 11941
http://plplot.svn.sourceforge.net/plplot/?rev=11941&view=rev
Author: airwin
Date: 2011-10-08 23:31:57 +0000 (Sat, 08 Oct 2011)
Log Message:
-----------
Disable OCaml by default for static build until rpath issues are
straightened out. Note, there is now a new option available called
ENABLE_ocaml_static which defaults to OFF, but if you set it to ON
you will get a build of OCaml for that static case.
Modified Paths:
--------------
trunk/cmake/modules/ocaml.cmake
Modified: trunk/cmake/modules/ocaml.cmake
===================================================================
--- trunk/cmake/modules/ocaml.cmake 2011-10-07 07:20:10 UTC (rev 11940)
+++ trunk/cmake/modules/ocaml.cmake 2011-10-08 23:31:57 UTC (rev 11941)
@@ -27,6 +27,14 @@
option(ENABLE_ocaml "Enable OCaml bindings" ON)
endif(DEFAULT_NO_BINDINGS)
+option(ENABLE_ocaml_static "Enable OCaml bindings for the static build case" OFF)
+
+if(NOT ENABLE_ocaml_static AND NOT BUILD_SHARED_LIBS)
+ message(STATUS "WARNING:"
+ "Static build with ENABLE_ocaml_static false. Therefore, disabling ocaml bindings")
+ set(ENABLE_ocaml OFF CACHE BOOL "Enable OCaml bindings" FORCE)
+endif(NOT ENABLE_ocaml_static AND NOT BUILD_SHARED_LIBS)
+
if(ENABLE_ocaml AND NOT BUILD_SHARED_LIBS)
message(STATUS "NOTICE: "
"OCaml requires -fPIC flag when building static PLplot. Forcing -fPIC for C and C++ compilation.")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|