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

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

Revision: 10887
          http://plplot.svn.sourceforge.net/plplot/?rev=10887&view=rev
Author:   airwin
Date:     2010-04-05 04:58:13 +0000 (Mon, 05 Apr 2010)

Log Message:
-----------
Fix build system logic for case when diff and/or tail not available.

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

Modified: trunk/examples/CMakeLists.txt
===================================================================
--- trunk/examples/CMakeLists.txt	2010-04-05 02:56:03 UTC (rev 10886)
+++ trunk/examples/CMakeLists.txt	2010-04-05 04:58:13 UTC (rev 10887)
@@ -481,13 +481,17 @@
       endif(ENABLE_${language})
     endforeach(language_info ${language_info_LIST})
 
-    # Note this target has complete file and target dependencies for
-    # a comparison of stdout and PostScript results.
-    add_custom_target(test_diff_psc COMMAND ${compare_command}
-      DEPENDS ${diff_files_LIST}
-      )
-    add_dependencies(test_diff_psc ${diff_targets_LIST})
-    set(noninteractive_targets_LIST test_diff_psc)
+    if(DIFF_EXECUTABLE AND TAIL_EXECUTABLE)
+      # Note this target has complete file and target dependencies for
+      # a comparison of stdout and PostScript results.
+      add_custom_target(test_diff_psc COMMAND ${compare_command}
+	DEPENDS ${diff_files_LIST}
+	)
+      add_dependencies(test_diff_psc ${diff_targets_LIST})
+      set(noninteractive_targets_LIST test_diff_psc)
+    else(DIFF_EXECUTABLE AND TAIL_EXECUTABLE)
+      set(noninteractive_targets_LIST)
+    endif(DIFF_EXECUTABLE AND TAIL_EXECUTABLE)
   else(PLD_psc)
     set(noninteractive_targets_LIST)
   endif(PLD_psc)

Modified: trunk/examples/plplot_configure.cmake_installed_examples.in
===================================================================
--- trunk/examples/plplot_configure.cmake_installed_examples.in	2010-04-05 02:56:03 UTC (rev 10886)
+++ trunk/examples/plplot_configure.cmake_installed_examples.in	2010-04-05 04:58:13 UTC (rev 10887)
@@ -211,3 +211,8 @@
 # Set external devices that are needed to build certain examples.
 set(PLD_extcairo @PLD_extcairo@)
 set(PLD_extqt @PLD_extqt@)
+
+# Needed to check if diff and tail on system for test_diff_psc target.
+
+set(DIFF_EXECUTABLE @DIFF_EXECUTABLE@)
+set(TAIL_EXECUTABLE @TAIL_EXECUTABLE@)


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