Menu
▾
▴
plplot-cvs
|
From: <ai...@us...> - 2008-09-01 17:27:59
|
Revision: 8743
http://plplot.svn.sourceforge.net/plplot/?rev=8743&view=rev
Author: airwin
Date: 2008-09-01 17:28:10 +0000 (Mon, 01 Sep 2008)
Log Message:
-----------
Enable ocaml by default.
Modified Paths:
--------------
trunk/cmake/modules/ocaml.cmake
Modified: trunk/cmake/modules/ocaml.cmake
===================================================================
--- trunk/cmake/modules/ocaml.cmake 2008-09-01 10:07:09 UTC (rev 8742)
+++ trunk/cmake/modules/ocaml.cmake 2008-09-01 17:28:10 UTC (rev 8743)
@@ -22,7 +22,7 @@
if(DEFAULT_NO_BINDINGS)
option(ENABLE_ocaml "Enable OCaml bindings" OFF)
else(DEFAULT_NO_BINDINGS)
- option(ENABLE_ocaml "Enable OCaml bindings" OFF)
+ option(ENABLE_ocaml "Enable OCaml bindings" ON)
endif(DEFAULT_NO_BINDINGS)
if(ENABLE_ocaml)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2008-10-11 01:50:17
|
Revision: 8880
http://plplot.svn.sourceforge.net/plplot/?rev=8880&view=rev
Author: airwin
Date: 2008-10-11 01:50:08 +0000 (Sat, 11 Oct 2008)
Log Message:
-----------
Turn off OCaml bindings and examples for the static library case.
Modified Paths:
--------------
trunk/cmake/modules/ocaml.cmake
Modified: trunk/cmake/modules/ocaml.cmake
===================================================================
--- trunk/cmake/modules/ocaml.cmake 2008-10-10 21:47:29 UTC (rev 8879)
+++ trunk/cmake/modules/ocaml.cmake 2008-10-11 01:50:08 UTC (rev 8880)
@@ -25,6 +25,12 @@
option(ENABLE_ocaml "Enable OCaml bindings" ON)
endif(DEFAULT_NO_BINDINGS)
+if(ENABLE_ocaml AND NOT BUILD_SHARED_LIBS)
+ message(STATUS "WARNING: "
+ "OCaml requires shared libraries. Disabling ocaml bindings")
+ set(ENABLE_ocaml OFF CACHE BOOL "Enable OCaml bindings" FORCE)
+endif(ENABLE_ocaml AND NOT BUILD_SHARED_LIBS)
+
if(ENABLE_ocaml)
find_program(OCAMLBUILD ocamlbuild)
if (OCAMLBUILD)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-03-03 21:17:12
|
Revision: 9670
http://plplot.svn.sourceforge.net/plplot/?rev=9670&view=rev
Author: andrewross
Date: 2009-03-03 21:17:10 +0000 (Tue, 03 Mar 2009)
Log Message:
-----------
Install ocaml packages in
${CMAKE_INSTALL_PREFIX}/lib/ocaml/${OCAML_VERSION}
rather than
${CMAKE_INSTALL_PREFIX}/lib/${OCAML_VERSION}
which is now consistent with Debian (as the comment suggests) and also
follows what we do for other languages.
Modified Paths:
--------------
trunk/cmake/modules/ocaml.cmake
Modified: trunk/cmake/modules/ocaml.cmake
===================================================================
--- trunk/cmake/modules/ocaml.cmake 2009-03-03 21:12:28 UTC (rev 9669)
+++ trunk/cmake/modules/ocaml.cmake 2009-03-03 21:17:10 UTC (rev 9670)
@@ -99,7 +99,7 @@
# Installation follows the Debian ocaml policy for want of a better
# standard.
- set(OCAML_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/${OCAML_VERSION}
+ set(OCAML_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/ocaml/${OCAML_VERSION}
CACHE PATH "install location for ocaml files"
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-10-01 14:35:38
|
Revision: 10506
http://plplot.svn.sourceforge.net/plplot/?rev=10506&view=rev
Author: airwin
Date: 2009-10-01 14:35:27 +0000 (Thu, 01 Oct 2009)
Log Message:
-----------
Correctly invert return codes to establish truth/falsity of OCAML_HAS_CAIRO
and OCAML_HAS_GTK.
Modified Paths:
--------------
trunk/cmake/modules/ocaml.cmake
Modified: trunk/cmake/modules/ocaml.cmake
===================================================================
--- trunk/cmake/modules/ocaml.cmake 2009-10-01 05:52:02 UTC (rev 10505)
+++ trunk/cmake/modules/ocaml.cmake 2009-10-01 14:35:27 UTC (rev 10506)
@@ -164,10 +164,18 @@
COMMAND ${OCAMLFIND} c -package cairo -linkpkg test_cairo.ml -o test_cairo
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
RESULT_VARIABLE OCAML_HAS_CAIRO
+ OUTPUT_QUIET
+ ERROR_QUIET
)
- # Invert the test result. What CMake takes as true is meant to be false.
- set(OCAML_HAS_CAIRO NOT OCAML_HAS_CAIRO)
+ # zero return code indicates no errors. Thus, OCAML_HAS_CAIRO must have
+ # truth inverted.
if(OCAML_HAS_CAIRO)
+ set(OCAML_HAS_CAIRO OFF)
+ else(OCAML_HAS_CAIRO)
+ set(OCAML_HAS_CAIRO ON)
+ endif(OCAML_HAS_CAIRO)
+
+ if(OCAML_HAS_CAIRO)
message(STATUS "Cairo OCaml library found")
else(OCAML_HAS_CAIRO)
message(STATUS "WARNING:"
@@ -183,10 +191,18 @@
COMMAND ${OCAMLFIND} c -package cairo.lablgtk2 -linkpkg test_gtk.ml -o test_gtk
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
RESULT_VARIABLE OCAML_HAS_GTK
+ OUTPUT_QUIET
+ ERROR_QUIET
)
- # Invert the test result. What CMake takes as true is meant to be false.
- set(OCAML_HAS_GTK NOT OCAML_HAS_GTK)
+ # zero return code indicates no errors. Thus, OCAML_HAS_CAIRO must have
+ # truth inverted.
if(OCAML_HAS_GTK)
+ set(OCAML_HAS_GTK OFF)
+ else(OCAML_HAS_GTK)
+ set(OCAML_HAS_GTK ON)
+ endif(OCAML_HAS_GTK)
+
+ if(OCAML_HAS_GTK)
message(STATUS "lablgtk2 OCaml library found")
else(OCAML_HAS_GTK)
message(STATUS "WARNING: lablgtk2 OCaml library not found.")
@@ -195,5 +211,7 @@
else(OCAMLFIND)
message(STATUS "WARNING:"
"ocamlfind not available. Disabling Plcairo module and lablgtk support")
+ set(OCAML_HAS_CAIRO OFF)
+ set(OCAML_HAS_GTK OFF)
endif(OCAMLFIND)
endif(ENABLE_ocaml)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2011-03-08 18:11:34
|
Revision: 11611
http://plplot.svn.sourceforge.net/plplot/?rev=11611&view=rev
Author: airwin
Date: 2011-03-08 18:11:27 +0000 (Tue, 08 Mar 2011)
Log Message:
-----------
Enable OCaml by default.
Modified Paths:
--------------
trunk/cmake/modules/ocaml.cmake
Modified: trunk/cmake/modules/ocaml.cmake
===================================================================
--- trunk/cmake/modules/ocaml.cmake 2011-03-08 17:37:32 UTC (rev 11610)
+++ trunk/cmake/modules/ocaml.cmake 2011-03-08 18:11:27 UTC (rev 11611)
@@ -24,7 +24,7 @@
if(DEFAULT_NO_BINDINGS)
option(ENABLE_ocaml "Enable OCaml bindings" OFF)
else(DEFAULT_NO_BINDINGS)
- option(ENABLE_ocaml "Enable OCaml bindings" OFF)
+ option(ENABLE_ocaml "Enable OCaml bindings" ON)
endif(DEFAULT_NO_BINDINGS)
if(ENABLE_ocaml AND NOT BUILD_SHARED_LIBS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2011-09-23 04:52:30
|
Revision: 11932
http://plplot.svn.sourceforge.net/plplot/?rev=11932&view=rev
Author: airwin
Date: 2011-09-23 04:52:23 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
Fresh checkout of ocaml is broken so disable it by default until Hez
gets a chance to fix it.
Modified Paths:
--------------
trunk/cmake/modules/ocaml.cmake
Modified: trunk/cmake/modules/ocaml.cmake
===================================================================
--- trunk/cmake/modules/ocaml.cmake 2011-09-20 08:24:25 UTC (rev 11931)
+++ trunk/cmake/modules/ocaml.cmake 2011-09-23 04:52:23 UTC (rev 11932)
@@ -24,7 +24,7 @@
if(DEFAULT_NO_BINDINGS)
option(ENABLE_ocaml "Enable OCaml bindings" OFF)
else(DEFAULT_NO_BINDINGS)
- option(ENABLE_ocaml "Enable OCaml bindings" ON)
+ option(ENABLE_ocaml "Enable OCaml bindings" OFF)
endif(DEFAULT_NO_BINDINGS)
if(ENABLE_ocaml AND NOT BUILD_SHARED_LIBS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-03-21 20:40:50
|
Revision: 13084
http://sourceforge.net/p/plplot/code/13084
Author: airwin
Date: 2014-03-21 20:40:45 +0000 (Fri, 21 Mar 2014)
Log Message:
-----------
Both OCTAVE_HAS_CAIRO and OCTAVE_HAS_GTK are made configurable by the
user with the default ON.
Modified Paths:
--------------
trunk/cmake/modules/ocaml.cmake
Modified: trunk/cmake/modules/ocaml.cmake
===================================================================
--- trunk/cmake/modules/ocaml.cmake 2014-03-18 03:13:46 UTC (rev 13083)
+++ trunk/cmake/modules/ocaml.cmake 2014-03-21 20:40:45 UTC (rev 13084)
@@ -2,7 +2,7 @@
#
# Copyright (C) 2008 Andrew Ross
# Copyright (C) 2009 Hezekiah M. Carty
-# Copyright (C) 2009 Alan W. Irwin
+# Copyright (C) 2009-2014 Alan W. Irwin
#
# This file is part of PLplot.
#
@@ -195,21 +195,21 @@
# Test for the availability of Cairo and Gtk+ bindings
if(OCAMLFIND)
if(PLD_extcairo)
- set(text_cairo "module C = Cairo")
- file(WRITE ${CMAKE_BINARY_DIR}/test_cairo.ml ${text_cairo})
- execute_process(
- COMMAND ${OCAMLFIND} c -package cairo -linkpkg test_cairo.ml -o test_cairo
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- RESULT_VARIABLE OCAML_HAS_CAIRO
- OUTPUT_QUIET
- ERROR_QUIET
- )
- # zero return code indicates no errors. Thus, OCAML_HAS_CAIRO must have
- # truth inverted.
+ option(OCAML_HAS_CAIRO "OCaml has the cairo package" ON)
if(OCAML_HAS_CAIRO)
- set(OCAML_HAS_CAIRO OFF)
- else(OCAML_HAS_CAIRO)
- set(OCAML_HAS_CAIRO ON)
+ set(text_cairo "module C = Cairo")
+ file(WRITE ${CMAKE_BINARY_DIR}/test_cairo.ml ${text_cairo})
+ execute_process(
+ COMMAND ${OCAMLFIND} c -package cairo -linkpkg test_cairo.ml -o test_cairo
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ RESULT_VARIABLE OCAML_HAS_CAIRO_RC
+ OUTPUT_QUIET
+ ERROR_QUIET
+ )
+ # non-zero return code indicates errors.
+ if(OCAML_HAS_CAIRO_RC)
+ set(OCAML_HAS_CAIRO OFF CACHE BOOL "OCaml has the cairo package" FORCE)
+ endif(OCAML_HAS_CAIRO_RC)
endif(OCAML_HAS_CAIRO)
if(OCAML_HAS_CAIRO)
@@ -226,36 +226,43 @@
else(linkflags)
message(STATUS "WARNING:"
"pkg-config could not find cairo module. Disabling Plcairo module")
- set(OCAML_HAS_CAIRO OFF)
+ set(OCAML_HAS_CAIRO OFF CACHE BOOL "OCaml has the cairo package" FORCE)
endif(linkflags)
else(PKG_CONFIG_EXECUTABLE)
message(STATUS "WARNING:"
"pkg-config not found. Disabling Plcairo module")
- set(OCAML_HAS_CAIRO OFF)
+ set(OCAML_HAS_CAIRO OFF CACHE BOOL "OCaml has the cairo package" FORCE)
endif(PKG_CONFIG_EXECUTABLE)
else(OCAML_HAS_CAIRO)
message(STATUS "WARNING:"
"Cairo OCaml library not found. Disabling Plcairo module")
endif(OCAML_HAS_CAIRO)
- set(text_gtk
- "module G = Gtk
+ if(OCAML_HAS_CAIRO)
+ option(OCAML_HAS_GTK "OCaml has the cairo.lablgtk2 package" ON)
+ else(OCAML_HAS_CAIRO)
+ message(STATUS "WARNING:"
+ "Cairo OCaml library not found. Disabling lablgtk2 support")
+ set(OCAML_HAS_GTK OFF CACHE BOOL "OCaml has the cairo.lablgtk2 package" FORCE)
+ endif(OCAML_HAS_CAIRO)
+
+ if(OCAML_HAS_GTK)
+ set(text_gtk
+ "module G = Gtk
module C = Cairo_lablgtk"
- )
- file (WRITE ${CMAKE_BINARY_DIR}/test_gtk.ml ${text_gtk})
- execute_process(
- COMMAND ${OCAMLFIND} c -package cairo.lablgtk2 -linkpkg test_gtk.ml -o test_gtk
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- RESULT_VARIABLE OCAML_HAS_GTK
- OUTPUT_QUIET
- ERROR_QUIET
- )
- # zero return code indicates no errors. Thus, OCAML_HAS_CAIRO must have
- # truth inverted.
- if(OCAML_HAS_GTK)
- set(OCAML_HAS_GTK OFF)
- else(OCAML_HAS_GTK)
- set(OCAML_HAS_GTK ON)
+ )
+ file (WRITE ${CMAKE_BINARY_DIR}/test_gtk.ml ${text_gtk})
+ execute_process(
+ COMMAND ${OCAMLFIND} c -package cairo.lablgtk2 -linkpkg test_gtk.ml -o test_gtk
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ RESULT_VARIABLE OCAML_HAS_GTK_RC
+ OUTPUT_QUIET
+ ERROR_QUIET
+ )
+ # non-zero return code indicates errors.
+ if(OCAML_HAS_GTK_RC)
+ set(OCAML_HAS_GTK OFF CACHE BOOL "OCaml has the cairo.lablgtk2 package" FORCE)
+ endif(OCAML_HAS_GTK_RC)
endif(OCAML_HAS_GTK)
if(OCAML_HAS_GTK)
@@ -266,11 +273,13 @@
endif (PLD_extcairo)
else(OCAMLFIND)
message(STATUS "WARNING:"
- "ocamlfind not available. Disabling Plcairo module and lablgtk support")
- set(OCAML_HAS_CAIRO OFF)
- set(OCAML_HAS_GTK OFF)
+ "ocamlfind not available. Disabling Plcairo module and lablgtk2 support")
+ set(OCAML_HAS_CAIRO OFF CACHE BOOL "OCaml has the cairo package" FORCE)
+ set(OCAML_HAS_GTK OFF CACHE BOOL "OCaml has the cairo.lablgtk2 package" FORCE)
endif(OCAMLFIND)
else(ENABLE_ocaml)
- set(OCAML_HAS_CAIRO OFF)
- set(OCAML_HAS_GTK OFF)
+ message(STATUS "WARNING:"
+ "ENABLE_ocaml is OFF so disabling Plcairo module and lablgtk2 support")
+ set(OCAML_HAS_CAIRO OFF CACHE BOOL "OCaml has the cairo package" FORCE)
+ set(OCAML_HAS_GTK OFF CACHE BOOL "OCaml has the cairo.lablgtk2 package" FORCE)
endif(ENABLE_ocaml)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-09-25 03:15:08
|
Revision: 10476
http://plplot.svn.sourceforge.net/plplot/?rev=10476&view=rev
Author: airwin
Date: 2009-09-25 03:14:57 +0000 (Fri, 25 Sep 2009)
Log Message:
-----------
Copyright.
Modified Paths:
--------------
trunk/cmake/modules/ocaml.cmake
Modified: trunk/cmake/modules/ocaml.cmake
===================================================================
--- trunk/cmake/modules/ocaml.cmake 2009-09-24 21:14:22 UTC (rev 10475)
+++ trunk/cmake/modules/ocaml.cmake 2009-09-25 03:14:57 UTC (rev 10476)
@@ -2,6 +2,7 @@
#
# Copyright (C) 2008 Andrew Ross
# Copyright (C) 2009 Hezekiah M. Carty
+# Copyright (C) 2009 Alan W. Irwin
#
# This file is part of PLplot.
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2011-01-25 22:56:18
|
Revision: 11496
http://plplot.svn.sourceforge.net/plplot/?rev=11496&view=rev
Author: airwin
Date: 2011-01-25 22:56:11 +0000 (Tue, 25 Jan 2011)
Log Message:
-----------
Enable the generate_plplot_h.inc target by default since that target is
only run at user option in any case.
Modified Paths:
--------------
trunk/cmake/modules/ocaml.cmake
Modified: trunk/cmake/modules/ocaml.cmake
===================================================================
--- trunk/cmake/modules/ocaml.cmake 2011-01-20 07:47:24 UTC (rev 11495)
+++ trunk/cmake/modules/ocaml.cmake 2011-01-25 22:56:11 UTC (rev 11496)
@@ -128,7 +128,7 @@
endif(ENABLE_ocaml)
if(ENABLE_ocaml)
- option(GENERATE_PLPLOT_H_INC "Generate generated_plplot_h.inc" OFF)
+ option(GENERATE_PLPLOT_H_INC "Generate generated_plplot_h.inc" ON)
if(GENERATE_PLPLOT_H_INC)
find_program(OCAML ocaml)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2011-01-25 23:54:03
|
Revision: 11497
http://plplot.svn.sourceforge.net/plplot/?rev=11497&view=rev
Author: airwin
Date: 2011-01-25 23:53:57 +0000 (Tue, 25 Jan 2011)
Log Message:
-----------
Revert to disabling the generate_plplot_h.inc target by default since
it demands extra ocaml dependencies which most users probably won't
have installed. This time put a comment in ocaml.cmake to explain this.
Modified Paths:
--------------
trunk/cmake/modules/ocaml.cmake
Modified: trunk/cmake/modules/ocaml.cmake
===================================================================
--- trunk/cmake/modules/ocaml.cmake 2011-01-25 22:56:11 UTC (rev 11496)
+++ trunk/cmake/modules/ocaml.cmake 2011-01-25 23:53:57 UTC (rev 11497)
@@ -128,7 +128,9 @@
endif(ENABLE_ocaml)
if(ENABLE_ocaml)
- option(GENERATE_PLPLOT_H_INC "Generate generated_plplot_h.inc" ON)
+ # Leave this OFF by default since this target requires extra
+ # dependencies such as libpcre-ocaml-dev package on Debian.
+ option(GENERATE_PLPLOT_H_INC "Generate generated_plplot_h.inc" OFF)
if(GENERATE_PLPLOT_H_INC)
find_program(OCAML ocaml)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2011-01-26 05:27:37
|
Revision: 11499
http://plplot.svn.sourceforge.net/plplot/?rev=11499&view=rev
Author: airwin
Date: 2011-01-26 05:27:31 +0000 (Wed, 26 Jan 2011)
Log Message:
-----------
Disable OCaml by default until the broken build caused by the recent
pllegend changes can be fixed.
Modified Paths:
--------------
trunk/cmake/modules/ocaml.cmake
Modified: trunk/cmake/modules/ocaml.cmake
===================================================================
--- trunk/cmake/modules/ocaml.cmake 2011-01-26 00:03:47 UTC (rev 11498)
+++ trunk/cmake/modules/ocaml.cmake 2011-01-26 05:27:31 UTC (rev 11499)
@@ -24,7 +24,7 @@
if(DEFAULT_NO_BINDINGS)
option(ENABLE_ocaml "Enable OCaml bindings" OFF)
else(DEFAULT_NO_BINDINGS)
- option(ENABLE_ocaml "Enable OCaml bindings" ON)
+ option(ENABLE_ocaml "Enable OCaml bindings" OFF)
endif(DEFAULT_NO_BINDINGS)
if(ENABLE_ocaml AND NOT BUILD_SHARED_LIBS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hez...@us...> - 2011-09-23 13:34:37
|
Revision: 11934
http://plplot.svn.sourceforge.net/plplot/?rev=11934&view=rev
Author: hezekiahcarty
Date: 2011-09-23 13:34:31 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
Re-enable OCaml by default now that the interface has been fixed
Modified Paths:
--------------
trunk/cmake/modules/ocaml.cmake
Modified: trunk/cmake/modules/ocaml.cmake
===================================================================
--- trunk/cmake/modules/ocaml.cmake 2011-09-23 13:34:23 UTC (rev 11933)
+++ trunk/cmake/modules/ocaml.cmake 2011-09-23 13:34:31 UTC (rev 11934)
@@ -24,7 +24,7 @@
if(DEFAULT_NO_BINDINGS)
option(ENABLE_ocaml "Enable OCaml bindings" OFF)
else(DEFAULT_NO_BINDINGS)
- option(ENABLE_ocaml "Enable OCaml bindings" OFF)
+ option(ENABLE_ocaml "Enable OCaml bindings" ON)
endif(DEFAULT_NO_BINDINGS)
if(ENABLE_ocaml AND NOT BUILD_SHARED_LIBS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <ai...@us...> - 2011-10-09 19:58:50
|
Revision: 11942
http://plplot.svn.sourceforge.net/plplot/?rev=11942&view=rev
Author: airwin
Date: 2011-10-09 19:58:44 +0000 (Sun, 09 Oct 2011)
Log Message:
-----------
Disable OCaml by default for this forthcoming release because of the
segfault issue and other mememory management issues that I have
spotted with valgrind.
Modified Paths:
--------------
trunk/cmake/modules/ocaml.cmake
Modified: trunk/cmake/modules/ocaml.cmake
===================================================================
--- trunk/cmake/modules/ocaml.cmake 2011-10-08 23:31:57 UTC (rev 11941)
+++ trunk/cmake/modules/ocaml.cmake 2011-10-09 19:58:44 UTC (rev 11942)
@@ -24,7 +24,7 @@
if(DEFAULT_NO_BINDINGS)
option(ENABLE_ocaml "Enable OCaml bindings" OFF)
else(DEFAULT_NO_BINDINGS)
- option(ENABLE_ocaml "Enable OCaml bindings" ON)
+ option(ENABLE_ocaml "Enable OCaml bindings" OFF)
endif(DEFAULT_NO_BINDINGS)
option(ENABLE_ocaml_static "Enable OCaml bindings for the static build case" OFF)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hez...@us...> - 2011-10-10 13:38:01
|
Revision: 11945
http://plplot.svn.sourceforge.net/plplot/?rev=11945&view=rev
Author: hezekiahcarty
Date: 2011-10-10 13:37:55 +0000 (Mon, 10 Oct 2011)
Log Message:
-----------
Re-enable the OCaml bindings by default
Modified Paths:
--------------
trunk/cmake/modules/ocaml.cmake
Modified: trunk/cmake/modules/ocaml.cmake
===================================================================
--- trunk/cmake/modules/ocaml.cmake 2011-10-10 05:47:24 UTC (rev 11944)
+++ trunk/cmake/modules/ocaml.cmake 2011-10-10 13:37:55 UTC (rev 11945)
@@ -24,7 +24,7 @@
if(DEFAULT_NO_BINDINGS)
option(ENABLE_ocaml "Enable OCaml bindings" OFF)
else(DEFAULT_NO_BINDINGS)
- option(ENABLE_ocaml "Enable OCaml bindings" OFF)
+ option(ENABLE_ocaml "Enable OCaml bindings" ON)
endif(DEFAULT_NO_BINDINGS)
option(ENABLE_ocaml_static "Enable OCaml bindings for the static build case" OFF)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X