From: <ai...@us...> - 2010-03-03 12:44:14
|
Revision: 10839 http://plplot.svn.sourceforge.net/plplot/?rev=10839&view=rev Author: airwin Date: 2010-03-03 12:44:08 +0000 (Wed, 03 Mar 2010) Log Message: ----------- Now that everything Tk-related seems to be working again (thanks to Arjen and Andrew), implement test_tk_01, test_tk_02, test_tk_03, and test_tk_04 targets to test the four Tk examples. Make these test targets dependencies of the overall test_interactive target. These new test targets (as well as test_interactive) work in both the build tree and installed examples tree. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2010-03-03 02:13:34 UTC (rev 10838) +++ trunk/examples/CMakeLists.txt 2010-03-03 12:44:08 UTC (rev 10839) @@ -684,15 +684,63 @@ list(APPEND interactive_targets_LIST test_pygcw) endif(ENABLE_pygcw) + if(ENABLE_tk AND PLD_tk) + set(targets_examples_tk) + + add_custom_target(test_tk_01 + COMMAND xtk01 -f ${CMAKE_CURRENT_BINARY_DIR}/tk/tk01 + ) + add_dependencies(test_tk_01 + tclIndex_tcl + tclIndex_tk + xwin + ) + list(APPEND targets_examples_tk test_tk_01) + + add_custom_target(test_tk_03 + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/tk03 + ) + add_dependencies(test_tk_03 + plserver + tclIndex_tcl + tclIndex_tk + xwin + ) + list(APPEND targets_examples_tk test_tk_03) + + if(ENABLE_itk) + add_custom_target(test_tk_02 + COMMAND xtk02 -f ${CMAKE_CURRENT_BINARY_DIR}/tk/tk02 + ) + add_dependencies(test_tk_02 + tclIndex_tcl + tclIndex_tk + xwin + ) + list(APPEND targets_examples_tk test_tk_02) + + add_custom_target(test_tk_04 + COMMAND xtk04 -f ${CMAKE_CURRENT_BINARY_DIR}/tk/tk04 + ) + add_dependencies(test_tk_04 + tclIndex_tcl + tclIndex_tk + xwin + ) + list(APPEND targets_examples_tk test_tk_04) + endif(ENABLE_itk) + + endif(ENABLE_tk) + + if(targets_examples_tk) + list(APPEND interactive_targets_LIST ${targets_examples_tk}) + endif(targets_examples_tk) + add_custom_target(test_interactive) if(interactive_targets_LIST) add_dependencies(test_interactive ${interactive_targets_LIST}) endif(interactive_targets_LIST) - if(targets_examples_tk) - list(APPEND interactive_targets_LIST ${targets_examples_tk}) - endif(targets_examples_tk) - # Custom target to test all of qt devices/special examples. # Must be maintained. add_custom_target(test_all_qt) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |