[Plplot-cvs] SF.net SVN: plplot:[10501] trunk

[<hez...@us...>]

Revision: 10501
          http://plplot.svn.sourceforge.net/plplot/?rev=10501&view=rev
Author:   hezekiahcarty
Date:     2009-09-30 22:48:10 +0000 (Wed, 30 Sep 2009)

Log Message:
-----------
Fix some mismatched if/endif blocks in the OCaml CMake files

Modified Paths:
--------------
    trunk/bindings/ocaml/plcairo/CMakeLists.txt
    trunk/examples/ocaml/CMakeLists.txt

Modified: trunk/bindings/ocaml/plcairo/CMakeLists.txt
===================================================================
--- trunk/bindings/ocaml/plcairo/CMakeLists.txt	2009-09-30 19:39:01 UTC (rev 10500)
+++ trunk/bindings/ocaml/plcairo/CMakeLists.txt	2009-09-30 22:48:10 UTC (rev 10501)
@@ -227,4 +227,4 @@
     DESTINATION ${OCAML_INSTALL_DIR}/stublibs
     )
 
-endif(ENABLE_ocaml AND OCAML_HAS_CAIRO)
+endif(ENABLE_ocaml AND OCAML_HAS_CAIRO AND linkflags)

Modified: trunk/examples/ocaml/CMakeLists.txt
===================================================================
--- trunk/examples/ocaml/CMakeLists.txt	2009-09-30 19:39:01 UTC (rev 10500)
+++ trunk/examples/ocaml/CMakeLists.txt	2009-09-30 22:48:10 UTC (rev 10501)
@@ -218,9 +218,9 @@
   #  DESTINATION ${DATA_DIR}/examples/ocaml
   #  )
 
-endif(CORE_BUILD)
+endif(CORE_BUILD AND OCAML_HAS_CAIRO AND OCAML_HAS_GTK)
 
-if(BUILD_TEST)
+if(BUILD_TEST AND OCAML_HAS_CAIRO AND OCAML_HAS_GTK)
   # Default to using ocaml if ocamlopt is not available.  Make sure the proper
   # files are cleaned up after a build, depending on the compiler used.
   if (OCAMLOPT)
@@ -295,4 +295,4 @@
     set_property(GLOBAL APPEND PROPERTY FILES_examples_ocaml ${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE_NAME})
   endforeach(STRING_INDEX ${ocaml_STRING_INDICES})
   set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${ocaml_EXTRA_CLEAN_FILES}")
-endif(BUILD_TEST)
+endif(BUILD_TEST AND OCAML_HAS_CAIRO AND OCAML_HAS_GTK)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.