From: <ai...@us...> - 2009-11-10 00:59:37
|
Revision: 10575 http://plplot.svn.sourceforge.net/plplot/?rev=10575&view=rev Author: airwin Date: 2009-11-10 00:59:25 +0000 (Tue, 10 Nov 2009) Log Message: ----------- Use new background setting capabilities for the extcairo device to insure a good background for the PostScript plot generated by the test_extcairo target. Replace interactive test_plplotcanvas_demo and test_plplotcanvas_animation targets with the interactive test_plplotcanvas target. Add interactive test_pygcw target with tested file and target dependencies for both the core build and installed examples build. Tweak wording of message for interactive test_c_<device> targets to make clear that it is an interactive device rather than a file device. These recent interactive test changes work well as can be seen by running make test_interactive either in the build tree (with BUILD_TEST=ON) or the installed examples tree (using the new CMake-based build system for those examples). However, there are still additional interactive targets that must be implemented and added as dependencies for the overall test_interactive target. Whitespace changes. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-11-10 00:16:41 UTC (rev 10574) +++ trunk/examples/CMakeLists.txt 2009-11-10 00:59:25 UTC (rev 10575) @@ -284,9 +284,9 @@ # Install soft-landing support for compiler detection/testing. install(FILES - ${CMAKE_SOURCE_DIR}/cmake/modules/language_support.cmake - DESTINATION ${DATA_DIR}/examples/cmake/modules - ) + ${CMAKE_SOURCE_DIR}/cmake/modules/language_support.cmake + DESTINATION ${DATA_DIR}/examples/cmake/modules + ) # Install PLplot-specific language support files needed for CMake-based # build of installed examples. @@ -497,7 +497,7 @@ list(APPEND device_depends ${files_examples_c}) else(files_examples_c) if(targets_examples_c) - list(APPEND device_depends ${targets_examples_c}) + list(APPEND device_depends ${targets_examples_c}) endif(targets_examples_c) endif(files_examples_c) @@ -547,7 +547,7 @@ if(PLD_extcairo) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ext-cairo-test.ps - COMMAND ext-cairo-test + COMMAND ext-cairo-test -drvopt set_background=1 DEPENDS ext-cairo-test cairo @@ -579,7 +579,7 @@ list(APPEND interactive_device_depends_${device} ${driver}) endif(ENABLE_DYNDRIVERS) add_custom_target(test_c_${device} - COMMAND ${CMAKE_COMMAND} -E echo "Generate C results for ${device} file device" + COMMAND ${CMAKE_COMMAND} -E echo "Generate C results for ${device} interactive device" COMMAND ${custom_env} ${custom_test_command} --verbose --interactive --device=${device} DEPENDS ${interactive_device_depends_${device}} @@ -598,21 +598,15 @@ endif(PLD_xcairo) if(ENABLE_gnome2) - add_custom_target(test_plplotcanvas_demo + add_custom_target(test_plplotcanvas COMMAND plplotcanvas_demo + COMMAND plplotcanvas_animation DEPENDS plplotcanvas_demo - gcw - ) - list(APPEND interactive_targets_LIST test_plplotcanvas_demo) - - add_custom_target(test_plplotcanvas_animation - COMMAND plplotcanvas_animation - DEPENDS plplotcanvas_animation gcw ) - list(APPEND interactive_targets_LIST test_plplotcanvas_animation) + list(APPEND interactive_targets_LIST test_plplotcanvas) endif(ENABLE_gnome2) endif(ENABLE_c) @@ -640,6 +634,38 @@ endif(ENABLE_cxx) + if(ENABLE_pygcw) + if(CORE_BUILD) + add_custom_target(test_pygcw + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/python/plplotcanvas_demo.py + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/python/plplotcanvas_animation.py + DEPENDS + gcwmodule + cplplotcanvasmodule + gcw + _plplotcmodule + ${CMAKE_CURRENT_BINARY_DIR}/python/plplotcanvas_demo.py + ${CMAKE_CURRENT_BINARY_DIR}/python/plplotcanvas_animation.py + WORKING_DIRECTORY + ${CMAKE_CURRENT_BINARY_DIR}/python + ) + add_dependencies(test_pygcw copy_plplotcanvas) + else(CORE_BUILD) + add_custom_target(test_pygcw + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/python/plplotcanvas_demo.py + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/python/plplotcanvas_animation.py + DEPENDS + gcwmodule + cplplotcanvasmodule + gcw + _plplotcmodule + WORKING_DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR}/python + ) + endif(CORE_BUILD) + list(APPEND interactive_targets_LIST test_pygcw) + endif(ENABLE_pygcw) + add_custom_target(test_interactive) if(interactive_targets_LIST) add_dependencies(test_interactive ${interactive_targets_LIST}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |