[Plplot-cvs] SF.net SVN: plplot:[11363] trunk/plplot_test

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

Revision: 11363
          http://plplot.svn.sourceforge.net/plplot/?rev=11363&view=rev
Author:   airwin
Date:     2010-12-03 19:37:11 +0000 (Fri, 03 Dec 2010)

Log Message:
-----------
Improved handling of pltcl location that should work in a
cross-platform way.

Modified Paths:
--------------
    trunk/plplot_test/CMakeLists.txt
    trunk/plplot_test/test_tcl.sh.in

Modified: trunk/plplot_test/CMakeLists.txt
===================================================================
--- trunk/plplot_test/CMakeLists.txt	2010-12-03 17:12:56 UTC (rev 11362)
+++ trunk/plplot_test/CMakeLists.txt	2010-12-03 19:37:11 UTC (rev 11363)
@@ -139,14 +139,19 @@
   endif(ENABLE_python)
 
   if(ENABLE_tcl)
+    get_target_property(pltcl_LOC pltcl LOCATION)
     configure_file(test_tcl.sh.in
       ${CMAKE_CURRENT_BINARY_DIR}/test_tcl.sh
       @ONLY
       )
-    list(APPEND SCRIPTS test_tcl.sh)
     add_test(examples_tcl
       ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=tcl"
       )
+    set(pltcl_LOC ${BIN_DIR}/pltcl${EXEEXT})
+    configure_file(test_tcl.sh.in
+      ${CMAKE_CURRENT_BINARY_DIR}/test_tcl.sh_install
+      @ONLY
+      )
   endif(ENABLE_tcl)
 
   if(ENABLE_pdl)
@@ -394,6 +399,14 @@
     RENAME plplot-test.sh
     )
 
+  if(ENABLE_tcl)
+    install(
+      FILES ${CMAKE_CURRENT_BINARY_DIR}/test_tcl.sh_install
+      DESTINATION ${DATA_DIR}/examples
+      PERMISSIONS ${PERM_SCRIPTS}
+      RENAME test_tcl.sh
+      )
+  endif(ENABLE_tcl)
   install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot-test-interactive.sh
     DESTINATION ${DATA_DIR}/examples

Modified: trunk/plplot_test/test_tcl.sh.in
===================================================================
--- trunk/plplot_test/test_tcl.sh.in	2010-12-03 17:12:56 UTC (rev 11362)
+++ trunk/plplot_test/test_tcl.sh.in	2010-12-03 19:37:11 UTC (rev 11363)
@@ -29,9 +29,9 @@
 export results
 cd "$tcldir"
 if [ "$verbose_test" ] ; then
-    echo "pltcl demo of plot"
+    echo "@pltcl_LOC@ demo of plot"
 fi
-pltcl@EXEEXT@ -dev $device -o "$results"/plot%n.$dsuffix $options <<EOF 2> test.error
+@pltcl_LOC@ -dev $device -o "$results"/plot%n.$dsuffix $options <<EOF 2> test.error
 plinit
 source plot.tcl
 plot stats.log {1 4}
@@ -52,9 +52,9 @@
     exit 1
 fi
 if [ "$verbose_test" ] ; then
-    echo "pltcl demo of plgrid"
+    echo "@pltcl_LOC@ demo of plgrid"
 fi
-pltcl@EXEEXT@ -dev $device -o "$results"/plgrid%n.$dsuffix $options <<EOF 2> test.error
+@pltcl_LOC@ -dev $device -o "$results"/plgrid%n.$dsuffix $options <<EOF 2> test.error
 plinit
 source plgrid.tcl
 plgrid


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