[Plplot-cvs] SF.net SVN: plplot:[9995] trunk/examples

[<ai...@us...>]

Revision: 9995
          http://plplot.svn.sourceforge.net/plplot/?rev=9995&view=rev
Author:   airwin
Date:     2009-05-23 21:20:13 +0000 (Sat, 23 May 2009)

Log Message:
-----------
Add test of octave examples to new CMake-based build system for the
installed examples tree.

Modified Paths:
--------------
    trunk/examples/CMakeLists.txt_installed_examples
    trunk/examples/plplot_configure.cmake_installed_examples.in

Modified: trunk/examples/CMakeLists.txt_installed_examples
===================================================================
--- trunk/examples/CMakeLists.txt_installed_examples	2009-05-23 20:22:17 UTC (rev 9994)
+++ trunk/examples/CMakeLists.txt_installed_examples	2009-05-23 21:20:13 UTC (rev 9995)
@@ -45,6 +45,12 @@
   list(APPEND language_info_LIST cxx:cxx)
 endif(ENABLE_cxx)
 
+if(ENABLE_d)
+  add_subdirectory(d)
+  get_property(targets_examples_d GLOBAL PROPERTY TARGETS_examples_d)
+  list(APPEND language_info_LIST d:d)
+endif(ENABLE_d)
+
 if(ENABLE_f77)
   add_subdirectory(f77)
   get_property(targets_examples_f77 GLOBAL PROPERTY TARGETS_examples_f77)
@@ -57,12 +63,6 @@
   list(APPEND language_info_LIST f95:f95)
 endif(ENABLE_f95)
 
-if(ENABLE_d)
-  add_subdirectory(d)
-  get_property(targets_examples_d GLOBAL PROPERTY TARGETS_examples_d)
-  list(APPEND language_info_LIST d:d)
-endif(ENABLE_d)
-
 if(ENABLE_java)
   add_subdirectory(java)
   get_property(targets_examples_java GLOBAL PROPERTY TARGETS_examples_java)
@@ -81,18 +81,8 @@
   list(APPEND language_info_LIST ocaml:ocaml)
 endif(ENABLE_ocaml)
 
-if(ENABLE_pdl)
-  list(APPEND language_info_LIST perl:pdl)
-endif(ENABLE_pdl)
-
-if(ENABLE_python)
-  add_subdirectory(python)
-  get_property(targets_examples_python GLOBAL PROPERTY TARGETS_examples_python)
-  list(APPEND language_info_LIST python:p)
-endif(ENABLE_python)
-
-# Octave not configured yet so the following stanza ignored for now.
 if(ENABLE_octave)
+  list(APPEND language_info_LIST octave:o)
   add_subdirectory(octave)
   execute_process(
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
@@ -106,6 +96,16 @@
     )
 endif(ENABLE_octave)
 
+if(ENABLE_pdl)
+  list(APPEND language_info_LIST perl:pdl)
+endif(ENABLE_pdl)
+
+if(ENABLE_python)
+  add_subdirectory(python)
+  get_property(targets_examples_python GLOBAL PROPERTY TARGETS_examples_python)
+  list(APPEND language_info_LIST python:p)
+endif(ENABLE_python)
+
 execute_process(
   COMMAND ${CMAKE_COMMAND} -E copy_if_different
   ${CMAKE_CURRENT_SOURCE_DIR}/lena.pgm 

Modified: trunk/examples/plplot_configure.cmake_installed_examples.in
===================================================================
--- trunk/examples/plplot_configure.cmake_installed_examples.in	2009-05-23 20:22:17 UTC (rev 9994)
+++ trunk/examples/plplot_configure.cmake_installed_examples.in	2009-05-23 21:20:13 UTC (rev 9995)
@@ -13,6 +13,7 @@
 set(ENABLE_java @ENABLE_java@)
 set(ENABLE_lua @ENABLE_lua@)
 set(ENABLE_ocaml @ENABLE_ocaml@)
+set(ENABLE_octave @ENABLE_octave@)
 set(ENABLE_pdl @ENABLE_pdl@)
 set(ENABLE_python @ENABLE_python@)
 


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