|
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.
|