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

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

Revision: 10181
          http://plplot.svn.sourceforge.net/plplot/?rev=10181&view=rev
Author:   airwin
Date:     2009-07-26 23:13:35 +0000 (Sun, 26 Jul 2009)

Log Message:
-----------
Reorder subdirectory processing for the core build and the installed
examples build to be as consistent as possible.

Modified Paths:
--------------
    trunk/examples/CMakeLists.txt
    trunk/examples/CMakeLists.txt_installed_examples

Modified: trunk/examples/CMakeLists.txt
===================================================================
--- trunk/examples/CMakeLists.txt	2009-07-26 23:12:07 UTC (rev 10180)
+++ trunk/examples/CMakeLists.txt	2009-07-26 23:13:35 UTC (rev 10181)
@@ -58,47 +58,62 @@
     )
 endif(BUILD_TEST)
 
+# Compiled example directories first.
 add_subdirectory(c)
+
+if(ENABLE_ada)
+  add_subdirectory(ada)
+endif(ENABLE_ada)
+
 if(ENABLE_cxx)
   add_subdirectory(c++)
 endif(ENABLE_cxx)
+
+if(ENABLE_d)
+  add_subdirectory(d)
+endif(ENABLE_d)
+
 if(ENABLE_f77)
   add_subdirectory(f77)
 endif(ENABLE_f77)
+
 if(ENABLE_f95)
   add_subdirectory(f95)
 endif(ENABLE_f95)
-if(ENABLE_python)
-  add_subdirectory(python)
-endif(ENABLE_python)
-if(ENABLE_tcl)
-  add_subdirectory(tcl)
-endif(ENABLE_tcl)
-if(ENABLE_tk)
-  add_subdirectory(tk)
-endif(ENABLE_tk)
+
 if(ENABLE_java)
   add_subdirectory(java)
 endif(ENABLE_java)
-if(ENABLE_pdl)
-  add_subdirectory(perl)
-endif(ENABLE_pdl)
-if(ENABLE_ada)
-  add_subdirectory(ada)
-endif(ENABLE_ada)
-if(ENABLE_d)
-  add_subdirectory(d)
-endif(ENABLE_d)
+
 if(ENABLE_ocaml)
   add_subdirectory(ocaml)
 endif(ENABLE_ocaml)
+
+if(ENABLE_tk)
+  add_subdirectory(tk)
+endif(ENABLE_tk)
+
+# Non-compiled example directories next.
 if(ENABLE_lua)
   add_subdirectory(lua)
 endif(ENABLE_lua)
+
+if(ENABLE_pdl)
+  add_subdirectory(perl)
+endif(ENABLE_pdl)
+
+if(ENABLE_python)
+  add_subdirectory(python)
+endif(ENABLE_python)
+
 if(ENABLE_octave)
   add_subdirectory(octave)
 endif(ENABLE_octave)
 
+if(ENABLE_tcl)
+  add_subdirectory(tcl)
+endif(ENABLE_tcl)
+
 # Configure Makefile.examples with some specific variables
 
 if(PLD_ps)

Modified: trunk/examples/CMakeLists.txt_installed_examples
===================================================================
--- trunk/examples/CMakeLists.txt_installed_examples	2009-07-26 23:12:07 UTC (rev 10180)
+++ trunk/examples/CMakeLists.txt_installed_examples	2009-07-26 23:13:35 UTC (rev 10181)
@@ -66,13 +66,17 @@
   get_property(targets_examples_java GLOBAL PROPERTY TARGETS_examples_java)
 endif(ENABLE_java)
 
+if(ENABLE_tk)
+  add_subdirectory(tk)
+  get_property(targets_examples_tk GLOBAL PROPERTY TARGETS_examples_tk)
+endif(ENABLE_tk)
+    
 if(ENABLE_ocaml)
   add_subdirectory(ocaml)
   get_property(targets_examples_ocaml GLOBAL PROPERTY TARGETS_examples_ocaml)
 endif(ENABLE_ocaml)
 
 if(ENABLE_octave)
-  add_subdirectory(octave)
   execute_process(
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
     ${CMAKE_CURRENT_SOURCE_DIR}/lena.img
@@ -167,11 +171,6 @@
   add_dependencies(test_noninteractive ${noninteractive_targets_LIST})
 endif(noninteractive_targets_LIST)
 
-if(ENABLE_tk)
-  add_subdirectory(tk)
-  get_property(targets_examples_tk GLOBAL PROPERTY TARGETS_examples_tk)
-endif(ENABLE_tk)
-    
 set(interactive_targets_LIST ${targets_examples_c})
 
 if(targets_examples_tk)


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