From: <ai...@us...> - 2010-03-07 23:07:10
|
Revision: 10859 http://plplot.svn.sourceforge.net/plplot/?rev=10859&view=rev Author: airwin Date: 2010-03-07 23:07:03 +0000 (Sun, 07 Mar 2010) Log Message: ----------- Fix file and target dependencies of test_octave_${interactive_device} targets. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2010-03-07 00:43:15 UTC (rev 10858) +++ trunk/examples/CMakeLists.txt 2010-03-07 23:07:03 UTC (rev 10859) @@ -584,7 +584,7 @@ string(REGEX REPLACE "^(.*):.*$" "\\1" device ${interactive_devices_info}) string(REGEX REPLACE "^.*:(.*)$" "\\1" driver ${interactive_devices_info}) - set(interactive_device_depends_${device} ${device_depends}) + set(interactive_device_depends_${device}) if(ENABLE_DYNDRIVERS) list(APPEND interactive_device_depends_${device} ${driver}) endif(ENABLE_DYNDRIVERS) @@ -605,13 +605,17 @@ list(APPEND interactive_targets_LIST test_c_${device}) if(ENABLE_octave) + get_property(targets_examples_octave GLOBAL PROPERTY TARGETS_examples_octave) + get_property(files_examples_octave GLOBAL PROPERTY FILES_examples_octave) add_custom_target(test_octave_${device} COMMAND ${CMAKE_COMMAND} -E echo "Generate interactive octave results for ${device} interactive device" COMMAND env ${custom_env} ${custom_test_command} --verbose --interactive_octave --device=${device} DEPENDS ${interactive_device_depends_${device}} + ${files_examples_octave} VERBATIM ) + add_dependencies(test_octave_${device} ${targets_examples_octave}) if(device STREQUAL "tk") if(CORE_BUILD) add_dependencies(test_octave_tk tclIndex_tk tclIndex_tcl plserver xwin) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |