From: <ai...@us...> - 2010-01-30 04:39:35
|
Revision: 10781 http://plplot.svn.sourceforge.net/plplot/?rev=10781&view=rev Author: airwin Date: 2010-01-30 04:39:29 +0000 (Sat, 30 Jan 2010) Log Message: ----------- Commentary tweak. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2010-01-30 04:37:12 UTC (rev 10780) +++ trunk/examples/CMakeLists.txt 2010-01-30 04:39:29 UTC (rev 10781) @@ -569,7 +569,7 @@ # INTERACTIVE_DEVICES_LIST is set in # cmake/modules/drivers-finish.cmake for all enabled _interactive_ # devices and is thus available for the core build. It is also - # configured in plplot_configure.cmake so and is thus available + # configured in plplot_configure.cmake and is thus available # for the installed examples tests. Each list member consists of # a colon-separated device name and driver name. foreach(interactive_devices_info ${INTERACTIVE_DEVICES_LIST}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-02-18 22:55:54
|
Revision: 10806 http://plplot.svn.sourceforge.net/plplot/?rev=10806&view=rev Author: airwin Date: 2010-02-18 22:55:28 +0000 (Thu, 18 Feb 2010) Log Message: ----------- Fix minor install location error for newly reorganized language support files. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2010-02-18 21:38:39 UTC (rev 10805) +++ trunk/examples/CMakeLists.txt 2010-02-18 22:55:28 UTC (rev 10806) @@ -335,7 +335,7 @@ string(REGEX REPLACE "^(.*):.*$" "\\1" LANG_SUPPORT_DIR ${LANG_SUPPORT_info}) string(REGEX REPLACE "^.*:(.*)$" "\\1" LANG_SUPPORT_FILE ${LANG_SUPPORT_info}) install(FILES - ${CMAKE_SOURCE_DIR}/cmake/modules/${LANG_SUPPORT_FILE} + ${CMAKE_SOURCE_DIR}/cmake/modules/${LANG_SUPPORT_DIR}/${LANG_SUPPORT_FILE} DESTINATION ${DATA_DIR}/examples/cmake/modules/${LANG_SUPPORT_DIR} ) endforeach(LANG_SUPPORT_info ${LANG_SUPPORT_FILES}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-02-27 06:32:07
|
Revision: 10821 http://plplot.svn.sourceforge.net/plplot/?rev=10821&view=rev Author: airwin Date: 2010-02-27 06:31:58 +0000 (Sat, 27 Feb 2010) Log Message: ----------- Set variables for targets cairo, gcw, wxwidgets, and qt for the -DENABLE_DYNDRIVERS=ON case. This fixes a build system bug for the -DENABLE_DYNDRIVERS=OFF case where these targets do not exist. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2010-02-27 03:17:44 UTC (rev 10820) +++ trunk/examples/CMakeLists.txt 2010-02-27 06:31:58 UTC (rev 10821) @@ -548,14 +548,20 @@ list(APPEND noninteractive_targets_LIST test_c_${device}) endforeach(file_devices_info ${FILE_DEVICES_LIST}) + if(ENABLE_DYNDRIVERS) + set(cairo_target cairo) + set(gcw_target gcw) + set(wxwidgets_target wxwidgets) + set(qt_target qt) + endif(ENABLE_DYNDRIVERS) if(PLD_extcairo) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ext-cairo-test.ps - COMMAND ext-cairo-test -drvopt set_background=1 - DEPENDS - ext-cairo-test - cairo - ) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ext-cairo-test.ps + COMMAND ext-cairo-test -drvopt set_background=1 + DEPENDS + ext-cairo-test + ${cairo_target} + ) add_custom_target(test_extcairo DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ext-cairo-test.ps ) @@ -604,7 +610,7 @@ COMMAND extXdrawable_demo DEPENDS extXdrawable_demo - cairo + ${cairo_target} ) list(APPEND interactive_targets_LIST test_extXdrawable) endif(PLD_xcairo) @@ -616,7 +622,7 @@ DEPENDS plplotcanvas_demo plplotcanvas_animation - gcw + ${gcw_target} ) list(APPEND interactive_targets_LIST test_plplotcanvas) endif(ENABLE_gnome2) @@ -629,7 +635,7 @@ COMMAND wxPLplotDemo DEPENDS wxPLplotDemo - wxwidgets + ${wxwidgets_target} ) list(APPEND interactive_targets_LIST test_wxPLplotDemo) endif(ENABLE_wxwidgets) @@ -639,7 +645,7 @@ COMMAND qt_example DEPENDS qt_example - qt + ${qt_target} ) list(APPEND interactive_targets_LIST test_qt_example) endif(PLD_extqt) @@ -654,7 +660,7 @@ DEPENDS gcwmodule cplplotcanvasmodule - gcw + ${gcw_target} _plplotcmodule ${CMAKE_CURRENT_BINARY_DIR}/python/plplotcanvas_demo.py ${CMAKE_CURRENT_BINARY_DIR}/python/plplotcanvas_animation.py @@ -669,7 +675,7 @@ DEPENDS gcwmodule cplplotcanvasmodule - gcw + ${gcw_target} _plplotcmodule WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/python This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-03-05 17:47:28
|
Revision: 10849 http://plplot.svn.sourceforge.net/plplot/?rev=10849&view=rev Author: airwin Date: 2010-03-05 17:47:22 +0000 (Fri, 05 Mar 2010) Log Message: ----------- Implement test_pyqt4_example interactive target which the test_interactive target depends upon. This works for both the build tree and the installed examples tree. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2010-03-05 17:45:48 UTC (rev 10848) +++ trunk/examples/CMakeLists.txt 2010-03-05 17:47:22 UTC (rev 10849) @@ -652,6 +652,32 @@ endif(ENABLE_cxx) + if(ENABLE_pyqt4) + if(CORE_BUILD) + add_custom_target(test_pyqt4_example + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/python/pyqt4_example.py + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/python + ) + add_dependencies(test_pyqt4_example + plplot_pyqt4 + python_examples + _plplotcmodule + qt + ) + else(CORE_BUILD) + add_custom_target(test_pyqt4_example + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/python/pyqt4_example.py + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/python + ) + add_dependencies(test_pyqt4_example + plplot_pyqt4 + _plplotcmodule + qt + ) + endif(CORE_BUILD) + list(APPEND interactive_targets_LIST test_pyqt4_example) + endif(ENABLE_pyqt4) + if(ENABLE_pygcw) if(CORE_BUILD) add_custom_target(test_pygcw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-03-05 23:51:22
|
Revision: 10854 http://plplot.svn.sourceforge.net/plplot/?rev=10854&view=rev Author: airwin Date: 2010-03-05 23:51:15 +0000 (Fri, 05 Mar 2010) Log Message: ----------- Fix mismatched endif (also spotted by David MacMahon). Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2010-03-05 20:45:22 UTC (rev 10853) +++ trunk/examples/CMakeLists.txt 2010-03-05 23:51:15 UTC (rev 10854) @@ -816,7 +816,7 @@ list(APPEND targets_examples_tk test_tk_04) endif(ENABLE_itk) - endif(ENABLE_tk) + endif(ENABLE_tk AND PLD_tk) if(targets_examples_tk) list(APPEND interactive_targets_LIST ${targets_examples_tk}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <ai...@us...> - 2010-05-10 16:47:16
|
Revision: 10981 http://plplot.svn.sourceforge.net/plplot/?rev=10981&view=rev Author: airwin Date: 2010-05-10 16:47:09 +0000 (Mon, 10 May 2010) Log Message: ----------- Improve dependencies for interactive device tests. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2010-05-10 12:52:30 UTC (rev 10980) +++ trunk/examples/CMakeLists.txt 2010-05-10 16:47:09 UTC (rev 10981) @@ -437,7 +437,7 @@ # must use _files_ (contained in files_examples_${language} # for file dependencies. # Another case covered here is when the subdirectory - # contains non-generated files In this case also you must + # contains non-generated examples files. In this case also you must # (of course) use _files_ for file dependencies. list(APPEND compare_file_depends_${language} ${files_examples_${language}}) else(files_examples_${language}) @@ -469,7 +469,6 @@ ) list(APPEND diff_targets_LIST test_${language}_psc) list(APPEND diff_files_LIST ${CMAKE_CURRENT_BINARY_DIR}/x01${suffix}.psc) - # If the subdirectory used an add_custom_target (as indicated # by both files_examples_${language} and targets_examples_${language} # being true), then for that special case must add a target-level @@ -500,6 +499,8 @@ # consistency sake. if(ENABLE_c) set(device_depends ${custom_test_command}) + # See explanation above about what to do with files_examples_c and + # targets_examples_c. if(files_examples_c) list(APPEND device_depends ${files_examples_c}) else(files_examples_c) @@ -538,6 +539,7 @@ list(APPEND file_device_depends_${device} ${driver}) endif(ENABLE_DYNDRIVERS) #message("DEBUG: OUTPUT filename = x01c${index}.${device}") + #message("DEBUG:file_device_depends_${device} = ${file_device_depends_${device}}") add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/x01c${index}.${device} COMMAND ${CMAKE_COMMAND} -E echo "Generate C results for ${device} file device" @@ -550,6 +552,10 @@ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/x01c${index}.${device} ) list(APPEND noninteractive_targets_LIST test_c_${device}) + # Follow what was done above. + if(files_examples_c AND targets_examples_c) + add_dependencies(test_c_${device} ${targets_examples_c}) + endif(files_examples_c AND targets_examples_c) endforeach(file_devices_info ${FILE_DEVICES_LIST}) if(ENABLE_DYNDRIVERS) @@ -589,6 +595,16 @@ string(REGEX REPLACE "^.*:(.*)$" "\\1" driver ${interactive_devices_info}) set(interactive_device_depends_${device}) + # See explanation above about what to do with files_examples_c and + # targets_examples_c. + if(files_examples_c) + list(APPEND interactive_device_depends_${device} ${files_examples_c}) + else(files_examples_c) + if(targets_examples_c) + list(APPEND interactive_device_depends_${device} ${targets_examples_c}) + endif(targets_examples_c) + endif(files_examples_c) + if(ENABLE_DYNDRIVERS) list(APPEND interactive_device_depends_${device} ${driver}) endif(ENABLE_DYNDRIVERS) @@ -606,6 +622,10 @@ add_dependencies(test_c_tk plserver xwin) endif(CORE_BUILD) endif(device STREQUAL "tk") + # Follow what was done above. + if(files_examples_c AND targets_examples_c) + add_dependencies(test_c_${device} ${targets_examples_c}) + endif(files_examples_c AND targets_examples_c) list(APPEND interactive_targets_LIST test_c_${device}) if(ENABLE_octave) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-05-30 15:35:58
|
Revision: 11034 http://plplot.svn.sourceforge.net/plplot/?rev=11034&view=rev Author: airwin Date: 2010-05-30 15:35:50 +0000 (Sun, 30 May 2010) Log Message: ----------- Maintain list of target dependencies for test_all_qt so that test does what it says. Add file dependencies for all dynamic devices. These are needed to insure the dynamic devices are tested with the test-drv-info application before use in other tests. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2010-05-28 15:42:51 UTC (rev 11033) +++ trunk/examples/CMakeLists.txt 2010-05-30 15:35:50 UTC (rev 11034) @@ -414,7 +414,12 @@ set(compare_file_depends ${custom_test_command}) if(ENABLE_DYNDRIVERS) # The ps shared object implements both the psc (and ps) devices. - list(APPEND compare_file_depends ps) + get_property(FILE_DEPENDS_ps GLOBAL PROPERTY FILE_DEPENDS_ps_dyndriver) + # FILE_DEPENDS_ps contains the filename associated with testing ps. + # It is empty if not a core build. + # The file dependency on ps takes care of all + # target and file dependencies associated with ps. + list(APPEND compare_file_depends ${FILE_DEPENDS_ps} ps) endif(ENABLE_DYNDRIVERS) set(diff_targets_LIST) @@ -479,6 +484,10 @@ #message(STATUS "DEBUG: targets_examples_${language} = ${targets_examples_${language}}") add_dependencies(test_${language}_psc ${targets_examples_${language}}) endif(files_examples_${language} AND targets_examples_${language}) + # FILE_DEPENDS_ps is empty if test_ps_dyndriver target is not defined. + if(FILE_DEPENDS_ps) + add_dependencies(test_${language}_psc test_ps_dyndriver) + endif(FILE_DEPENDS_ps) endif(ENABLE_${language}) endforeach(language_info ${language_info_LIST}) @@ -538,7 +547,12 @@ set(file_device_depends_${device} ${device_depends}) if(ENABLE_DYNDRIVERS) - list(APPEND file_device_depends_${device} ${driver}) + get_property(FILE_DEPENDS_${driver} + GLOBAL PROPERTY FILE_DEPENDS_${driver}_dyndriver + ) + list(APPEND file_device_depends_${device} + ${FILE_DEPENDS_${driver}} ${driver} + ) endif(ENABLE_DYNDRIVERS) #message("DEBUG: OUTPUT filename = x01c${index}.${device}") #message("DEBUG:file_device_depends_${device} = ${file_device_depends_${device}}") @@ -558,13 +572,41 @@ if(files_examples_c AND targets_examples_c) add_dependencies(test_c_${device} ${targets_examples_c}) endif(files_examples_c AND targets_examples_c) + if(FILE_DEPENDS_${driver}) + add_dependencies(test_c_${device} test_${driver}_dyndriver) + endif(FILE_DEPENDS_${driver}) endforeach(file_devices_info ${FILE_DEVICES_LIST}) if(ENABLE_DYNDRIVERS) - set(cairo_target cairo) - set(gcw_target gcw) - set(wxwidgets_target wxwidgets) - set(qt_target qt) + # These required for some of the following special targets that are + # not handled by the foreach loop over interactive devices. Therefore, + # this list of variables does not need to be complete over all + # interactive devices. + get_property(FILE_DEPENDS_cairo + GLOBAL PROPERTY FILE_DEPENDS_cairo_dyndriver + ) + set(cairo_target ${FILE_DEPENDS_cairo} cairo) + + get_property(FILE_DEPENDS_gcw + GLOBAL PROPERTY FILE_DEPENDS_gcw_dyndriver + ) + set(gcw_target ${FILE_DEPENDS_gcw} gcw) + + get_property(FILE_DEPENDS_qt + GLOBAL PROPERTY FILE_DEPENDS_qt_dyndriver + ) + set(qt_target ${FILE_DEPENDS_qt} qt) + + get_property(FILE_DEPENDS_wxwidgets + GLOBAL PROPERTY FILE_DEPENDS_wxwidgets_dyndriver + ) + set(wxwidgets_target ${FILE_DEPENDS_wxwidgets} wxwidgets) + + get_property(FILE_DEPENDS_xwin + GLOBAL PROPERTY FILE_DEPENDS_xwin_dyndriver + ) + set(xwin_target ${FILE_DEPENDS_xwin} xwin) + endif(ENABLE_DYNDRIVERS) if(PLD_extcairo) add_custom_command( @@ -577,6 +619,9 @@ add_custom_target(test_extcairo DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ext-cairo-test.ps ) + if(FILE_DEPENDS_cairo) + add_dependencies(test_extcairo test_cairo_dyndriver) + endif(FILE_DEPENDS_cairo) list(APPEND noninteractive_targets_LIST test_extcairo) endif(PLD_extcairo) @@ -608,7 +653,17 @@ endif(files_examples_c) if(ENABLE_DYNDRIVERS) - list(APPEND interactive_device_depends_${device} ${driver}) + get_property(FILE_DEPENDS_${driver} + GLOBAL PROPERTY FILE_DEPENDS_${driver}_dyndriver + ) + list(APPEND interactive_device_depends_${device} + ${FILE_DEPENDS_${driver}} ${driver} + ) + if(device STREQUAL "tk") + list(APPEND interactive_device_depends_${device} + ${FILE_DEPENDS_xwin} xwin + ) + endif(device STREQUAL "tk") endif(ENABLE_DYNDRIVERS) add_custom_target(test_c_${device} COMMAND ${CMAKE_COMMAND} -E echo "Generate C results for ${device} interactive device" @@ -617,11 +672,17 @@ ${interactive_device_depends_${device}} VERBATIM ) + if(FILE_DEPENDS_${driver}) + add_dependencies(test_c_${device} test_${driver}_dyndriver) + endif(FILE_DEPENDS_${driver}) if(device STREQUAL "tk") if(CORE_BUILD) - add_dependencies(test_c_tk tclIndex_tk tclIndex_tcl plserver xwin) + add_dependencies(test_c_tk tclIndex_tk tclIndex_tcl plserver) + if(FILE_DEPENDS_xwin) + add_dependencies(test_c_${device} test_xwin_dyndriver) + endif(FILE_DEPENDS_xwin) else(CORE_BUILD) - add_dependencies(test_c_tk plserver xwin) + add_dependencies(test_c_tk plserver) endif(CORE_BUILD) endif(device STREQUAL "tk") # Follow what was done above. @@ -642,11 +703,17 @@ VERBATIM ) add_dependencies(test_octave_${device} ${targets_examples_octave}) + if(FILE_DEPENDS_${driver}) + add_dependencies(test_octave_${device} test_${driver}_dyndriver) + endif(FILE_DEPENDS_${driver}) if(device STREQUAL "tk") if(CORE_BUILD) - add_dependencies(test_octave_tk tclIndex_tk tclIndex_tcl plserver xwin) + add_dependencies(test_octave_tk tclIndex_tk tclIndex_tcl plserver) + if(FILE_DEPENDS_xwin) + add_dependencies(test_octave_tk test_xwin_dyndriver) + endif(FILE_DEPENDS_xwin) else(CORE_BUILD) - add_dependencies(test_octave_tk plserver xwin) + add_dependencies(test_octave_tk plserver) endif(CORE_BUILD) endif(device STREQUAL "tk") # Comment this out until interactive octave tests work better. @@ -661,6 +728,9 @@ extXdrawable_demo ${cairo_target} ) + if(FILE_DEPENDS_cairo) + add_dependencies(test_extXdrawable test_cairo_dyndriver) + endif(FILE_DEPENDS_cairo) list(APPEND interactive_targets_LIST test_extXdrawable) endif(PLD_xcairo) @@ -673,6 +743,9 @@ plplotcanvas_animation ${gcw_target} ) + if(FILE_DEPENDS_gcw) + add_dependencies(test_plplotcanvas test_gcw_dyndriver) + endif(FILE_DEPENDS_gcw) list(APPEND interactive_targets_LIST test_plplotcanvas) endif(ENABLE_gnome2) @@ -686,6 +759,9 @@ wxPLplotDemo ${wxwidgets_target} ) + if(FILE_DEPENDS_wxwidgets) + add_dependencies(test_wxPLplotDemo test_wxwidgets_dyndriver) + endif(FILE_DEPENDS_wxwidgets) list(APPEND interactive_targets_LIST test_wxPLplotDemo) endif(ENABLE_wxwidgets) @@ -696,6 +772,9 @@ qt_example ${qt_target} ) + if(FILE_DEPENDS_qt) + add_dependencies(test_qt_example test_qt_dyndriver) + endif(FILE_DEPENDS_qt) list(APPEND interactive_targets_LIST test_qt_example) endif(PLD_extqt) @@ -713,6 +792,9 @@ _plplotcmodule qt ) + if(FILE_DEPENDS_qt) + add_dependencies(test_pyqt4_example test_qt_dyndriver) + endif(FILE_DEPENDS_qt) else(CORE_BUILD) add_custom_target(test_pyqt4_example COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/python/pyqt4_example.py @@ -724,7 +806,8 @@ qt ) endif(CORE_BUILD) - list(APPEND interactive_targets_LIST test_pyqt4_example) + + list(APPEND interactive_targets_LIST test_pyqt4_example) endif(ENABLE_pyqt4) if(ENABLE_pygcw) @@ -743,6 +826,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/python ) add_dependencies(test_pygcw copy_plplotcanvas) + if(FILE_DEPENDS_gcw) + add_dependencies(test_pygcw test_gcw_dyndriver) + endif(FILE_DEPENDS_gcw) else(CORE_BUILD) add_custom_target(test_pygcw COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/python/plplotcanvas_demo.py @@ -764,16 +850,21 @@ add_custom_target(test_tk_01 COMMAND xtk01 -f ${CMAKE_CURRENT_BINARY_DIR}/tk/tk01 + DEPENDS ${xwin_target} ) add_dependencies(test_tk_01 tclIndex_tcl tclIndex_tk xwin ) + if(FILE_DEPENDS_xwin) + add_dependencies(test_tk_01 test_xwin_dyndriver) + endif(FILE_DEPENDS_xwin) list(APPEND targets_examples_tk test_tk_01) add_custom_target(test_tk_03 COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/tk03 + DEPENDS ${xwin_target} ) add_dependencies(test_tk_03 plserver @@ -781,16 +872,21 @@ tclIndex_tk xwin ) + if(FILE_DEPENDS_xwin) + add_dependencies(test_tk_03 test_xwin_dyndriver) + endif(FILE_DEPENDS_xwin) list(APPEND targets_examples_tk test_tk_03) if(CORE_BUILD) add_custom_target(test_tk_plgrid COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/plgrid + DEPENDS ${xwin_target} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tcl ) else(CORE_BUILD) add_custom_target(test_tk_plgrid COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/plgrid + DEPENDS ${xwin_target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tcl ) endif(CORE_BUILD) @@ -801,16 +897,21 @@ tclIndex_tk xwin ) + if(FILE_DEPENDS_xwin) + add_dependencies(test_tk_plgrid test_xwin_dyndriver) + endif(FILE_DEPENDS_xwin) list(APPEND targets_examples_tk test_tk_plgrid) if(CORE_BUILD) add_custom_target(test_tk_standard_examples COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/standard_examples + DEPENDS ${xwin_target} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk ) else(CORE_BUILD) add_custom_target(test_tk_standard_examples COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/standard_examples + DEPENDS ${xwin_target} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk ) endif(CORE_BUILD) @@ -822,27 +923,38 @@ tclIndex_examples_tk xwin ) + if(FILE_DEPENDS_xwin) + add_dependencies(test_tk_standard_examples test_xwin_dyndriver) + endif(FILE_DEPENDS_xwin) list(APPEND targets_examples_tk test_tk_standard_examples) if(ENABLE_itk) add_custom_target(test_tk_02 COMMAND xtk02 -f ${CMAKE_CURRENT_BINARY_DIR}/tk/tk02 + DEPENDS ${xwin_target} ) add_dependencies(test_tk_02 tclIndex_tcl tclIndex_tk xwin ) + if(FILE_DEPENDS_xwin) + add_dependencies(test_tk_02 test_xwin_dyndriver) + endif(FILE_DEPENDS_xwin) list(APPEND targets_examples_tk test_tk_02) add_custom_target(test_tk_04 COMMAND xtk04 -f ${CMAKE_CURRENT_BINARY_DIR}/tk/tk04 + DEPENDS ${xwin_target} ) add_dependencies(test_tk_04 tclIndex_tcl tclIndex_tk xwin ) + if(FILE_DEPENDS_xwin) + add_dependencies(test_tk_04 test_xwin_dyndriver) + endif(FILE_DEPENDS_xwin) list(APPEND targets_examples_tk test_tk_04) endif(ENABLE_itk) @@ -861,15 +973,17 @@ # Must be maintained. add_custom_target(test_all_qt) add_dependencies(test_all_qt + test_c_bmpqt test_c_epsqt + test_c_jpgqt test_c_pdfqt - test_c_bmpqt - test_c_jpgqt test_c_pngqt test_c_ppmqt + test_c_qtwidget + test_c_svgqt test_c_tiffqt - test_c_svgqt - test_c_qtwidget + #test_octave_qtwidget + test_pyqt4_example test_qt_example ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-06-16 18:07:16
|
Revision: 11077 http://plplot.svn.sourceforge.net/plplot/?rev=11077&view=rev Author: airwin Date: 2010-06-16 18:07:09 +0000 (Wed, 16 Jun 2010) Log Message: ----------- Implement the test_tcl_standard_examples target (which can be run independently or as a dependency of the test_interactive target) to run Arjen's new examples/tcl/standard_examples(.in) script. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2010-06-16 18:04:26 UTC (rev 11076) +++ trunk/examples/CMakeLists.txt 2010-06-16 18:07:09 UTC (rev 11077) @@ -845,6 +845,33 @@ list(APPEND interactive_targets_LIST test_pygcw) endif(ENABLE_pygcw) + if(ENABLE_tcl) + if(CORE_BUILD) + add_custom_target(test_tcl_standard_examples + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tcl/standard_examples -dev xwin -np + DEPENDS ${xwin_target} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tcl + ) + else(CORE_BUILD) + add_custom_target(test_tcl_standard_examples + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tcl/standard_examples -dev xwin -np + DEPENDS ${xwin_target} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tcl + ) + endif(CORE_BUILD) + add_dependencies(test_tcl_standard_examples + pltcl + tcl_examples + tclIndex_tcl + xwin + ) + if(FILE_DEPENDS_xwin) + add_dependencies(test_tcl_standard_examples test_xwin_dyndriver) + endif(FILE_DEPENDS_xwin) + list(APPEND interactive_targets_LIST ${test_tcl_standard_examples}) + + endif(ENABLE_tcl) + if(ENABLE_tk AND PLD_tk) set(targets_examples_tk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-08-12 15:36:13
|
Revision: 11127 http://plplot.svn.sourceforge.net/plplot/?rev=11127&view=rev Author: airwin Date: 2010-08-12 15:36:07 +0000 (Thu, 12 Aug 2010) Log Message: ----------- Fix implementation of test_all_qt and test_all_cairo so only existing targets are dependencies of those two targets. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2010-08-12 15:01:04 UTC (rev 11126) +++ trunk/examples/CMakeLists.txt 2010-08-12 15:36:07 UTC (rev 11127) @@ -996,10 +996,9 @@ add_dependencies(test_interactive ${interactive_targets_LIST}) endif(interactive_targets_LIST) - # Custom target to test all of qt devices/special examples. + # List of custom targets that test all of qt devices/special examples. # Must be maintained. - add_custom_target(test_all_qt) - add_dependencies(test_all_qt + set(qt_test_target_LIST test_c_bmpqt test_c_epsqt test_c_jpgqt @@ -1014,10 +1013,20 @@ test_qt_example ) - # Custom target to test all of cairo devices/special examples. + set(qt_test_target_DEPENDS) + foreach(qt_test_target ${qt_test_target_LIST}) + if(TARGET ${qt_test_target}) + list(APPEND qt_test_target_DEPENDS ${qt_test_target}) + endif(TARGET ${qt_test_target}) + endforeach(qt_test_target ${qt_test_target_LIST}) + if(qt_test_target_DEPENDS) + add_custom_target(test_all_qt) + add_dependencies(test_all_qt ${qt_test_target_DEPENDS}) + endif(qt_test_target_DEPENDS) + + # List of custom targets that test all of cairo devices/special examples. # Must be maintained. - add_custom_target(test_all_cairo) - add_dependencies(test_all_cairo + set(cairo_test_target_LIST test_c_pdfcairo test_c_pngcairo test_c_pscairo @@ -1027,6 +1036,17 @@ test_extXdrawable ) + set(cairo_test_target_DEPENDS) + foreach(cairo_test_target ${cairo_test_target_LIST}) + if(TARGET ${cairo_test_target}) + list(APPEND cairo_test_target_DEPENDS ${cairo_test_target}) + endif(TARGET ${cairo_test_target}) + endforeach(cairo_test_target ${cairo_test_target_LIST}) + if(cairo_test_target_DEPENDS) + add_custom_target(test_all_cairo) + add_dependencies(test_all_cairo ${cairo_test_target_DEPENDS}) + endif(cairo_test_target_DEPENDS) + endif(BUILD_TEST) if(NOT CORE_BUILD) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-08-13 15:18:00
|
Revision: 11134 http://plplot.svn.sourceforge.net/plplot/?rev=11134&view=rev Author: airwin Date: 2010-08-13 15:17:54 +0000 (Fri, 13 Aug 2010) Log Message: ----------- The test_tcl_standard_examples target uses the xwin device. So only add test_tcl_standard_examples target if PLD_xwin is ON. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2010-08-12 22:25:28 UTC (rev 11133) +++ trunk/examples/CMakeLists.txt 2010-08-13 15:17:54 UTC (rev 11134) @@ -845,7 +845,7 @@ list(APPEND interactive_targets_LIST test_pygcw) endif(ENABLE_pygcw) - if(ENABLE_tcl) + if(ENABLE_tcl AND PLD_xwin) if(CORE_BUILD) add_custom_target(test_tcl_standard_examples COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tcl/standard_examples -dev xwin -np @@ -870,7 +870,7 @@ endif(FILE_DEPENDS_xwin) list(APPEND interactive_targets_LIST ${test_tcl_standard_examples}) - endif(ENABLE_tcl) + endif(ENABLE_tcl AND PLD_xwin) if(ENABLE_tk AND PLD_tk) set(targets_examples_tk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-12-29 23:24:11
|
Revision: 11399 http://plplot.svn.sourceforge.net/plplot/?rev=11399&view=rev Author: airwin Date: 2010-12-29 23:24:04 +0000 (Wed, 29 Dec 2010) Log Message: ----------- Use a variable to specify which of the standard examples is the formal file dependency for all given languages. Normally this formal file dependency is example 1. But this variable makes it much easier to deal with the cases where a language exists that does not have that particular standard example implemented. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2010-12-29 05:51:49 UTC (rev 11398) +++ trunk/examples/CMakeLists.txt 2010-12-29 23:24:04 UTC (rev 11399) @@ -410,6 +410,8 @@ set(compare_command ${CMAKE_CURRENT_SOURCE_DIR}/test_diff.sh) endif(CORE_BUILD) + # Pick a standard example to depend on which is available in all languages. + set(stdnum 01) if(PLD_psc) set(compare_file_depends ${custom_test_command}) if(ENABLE_DYNDRIVERS) @@ -465,17 +467,17 @@ endif(language STREQUAL "java") add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/x01${suffix}.psc + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/x${stdnum}${suffix}.psc COMMAND ${CMAKE_COMMAND} -E echo "Generate ${language} results for psc device" COMMAND env ${environment} ${custom_test_command} --verbose --front-end=${language} --device=psc DEPENDS ${compare_file_depends_${language}} VERBATIM ) add_custom_target(test_${language}_psc - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/x01${suffix}.psc + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/x${stdnum}${suffix}.psc ) list(APPEND diff_targets_LIST test_${language}_psc) - list(APPEND diff_files_LIST ${CMAKE_CURRENT_BINARY_DIR}/x01${suffix}.psc) + list(APPEND diff_files_LIST ${CMAKE_CURRENT_BINARY_DIR}/x${stdnum}${suffix}.psc) # If the subdirectory used an add_custom_target (as indicated # by both files_examples_${language} and targets_examples_${language} # being true), then for that special case must add a target-level @@ -554,10 +556,10 @@ ${FILE_DEPENDS_${driver}} ${driver} ) endif(ENABLE_DYNDRIVERS) - #message("DEBUG: OUTPUT filename = x01c${index}.${device}") + #message("DEBUG: OUTPUT filename = x${stdnum}c${index}.${device}") #message("DEBUG:file_device_depends_${device} = ${file_device_depends_${device}}") add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/x01c${index}.${device} + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/x${stdnum}c${index}.${device} COMMAND ${CMAKE_COMMAND} -E echo "Generate C results for ${device} file device" COMMAND env ${custom_env} ${custom_test_command} --verbose --front-end=c --device=${device} DEPENDS @@ -565,7 +567,7 @@ VERBATIM ) add_custom_target(test_c_${device} - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/x01c${index}.${device} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/x${stdnum}c${index}.${device} ) list(APPEND noninteractive_targets_LIST test_c_${device}) # Follow what was done above. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-09-29 20:41:24
|
Revision: 12548 http://sourceforge.net/p/plplot/code/12548 Author: airwin Date: 2013-09-29 20:41:21 +0000 (Sun, 29 Sep 2013) Log Message: ----------- Fix rpath issue (couldn't find shapelib) with qt_example for traditional build system of installed examples. Tested by: Alan W. Irwin <ai...@us...> using scripts/comprehensive_test.sh for case where shapelib had a non-standard location. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2013-09-29 10:21:53 UTC (rev 12547) +++ trunk/examples/CMakeLists.txt 2013-09-29 20:41:21 UTC (rev 12548) @@ -221,7 +221,7 @@ if(ENABLE_DYNDRIVERS) get_target_property(_qt_INSTALL_RPATH qt INSTALL_RPATH) string(REGEX REPLACE ";" ":" qt_INSTALL_RPATH "${_qt_INSTALL_RPATH}") - set(qt_RPATHCMD "-Wl,-rpath -Wl,${qt_INSTALL_RPATH}:${DRV_DIR}") + set(qt_RPATHCMD "-Wl,-rpath -Wl,${LIB_INSTALL_RPATH}:${qt_INSTALL_RPATH}:${DRV_DIR}") else(ENABLE_DYNDRIVERS) set(qt_RPATHCMD ${RPATHCMD}) endif(ENABLE_DYNDRIVERS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-11-13 22:53:41
|
Revision: 12694 http://sourceforge.net/p/plplot/code/12694 Author: airwin Date: 2013-11-13 22:53:37 +0000 (Wed, 13 Nov 2013) Log Message: ----------- Fix minor build-system issue that was keeping the test_tcl_standard_examples target from being added to what was run by the test_interactive target. Tested by Alan W. Irwin <ai...@us...> on Linux using the test_interactive target. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2013-11-13 22:07:52 UTC (rev 12693) +++ trunk/examples/CMakeLists.txt 2013-11-13 22:53:37 UTC (rev 12694) @@ -895,7 +895,7 @@ if(FILE_DEPENDS_xwin) add_dependencies(test_tcl_standard_examples test_xwin_dyndriver) endif(FILE_DEPENDS_xwin) - list(APPEND interactive_targets_LIST ${test_tcl_standard_examples}) + list(APPEND interactive_targets_LIST test_tcl_standard_examples) endif(ENABLE_tcl AND PLD_xwin) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-11-18 21:56:44
|
Revision: 12715 http://sourceforge.net/p/plplot/code/12715 Author: airwin Date: 2013-11-18 21:56:40 +0000 (Mon, 18 Nov 2013) Log Message: ----------- Correct the dependencies of the test_tclsh_standard_examples target. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2013-11-18 21:54:26 UTC (rev 12714) +++ trunk/examples/CMakeLists.txt 2013-11-18 21:56:40 UTC (rev 12715) @@ -895,7 +895,7 @@ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tcl ) add_dependencies(test_tclsh_standard_examples - pltcl + plplottcltk${LIB_TAG} tcl_examples tclIndex_tcl xwin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-11-20 19:25:55
|
Revision: 12724 http://sourceforge.net/p/plplot/code/12724 Author: airwin Date: 2013-11-20 19:25:53 +0000 (Wed, 20 Nov 2013) Log Message: ----------- Add WARNING messages concerning individual interactive test targets that have been implemented but which do not work well (if at all) so they are temporarily excluded from being a dependency of other more general interactive test targets. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2013-11-20 07:14:37 UTC (rev 12723) +++ trunk/examples/CMakeLists.txt 2013-11-20 19:25:53 UTC (rev 12724) @@ -743,7 +743,9 @@ add_dependencies(test_octave_tk plserver) endif(CORE_BUILD) endif(device STREQUAL "tk") - # Comment this out until interactive octave tests work better. + message(STATUS "WARNING: The test_octave_${device} target can be run independently but does not + work reliably so it is temporarily excluded from being a dependency of other + more general interactive test targets") #list(APPEND interactive_targets_LIST test_octave_${device}) endif(ENABLE_octave) endforeach(interactive_devices_info ${INTERACTIVE_DEVICES_LIST}) @@ -1006,6 +1008,9 @@ # compatible with how we have implemented the Tcl plframe command # that is run by tkdemos.tcl in the wish case, but that is as much # as we know at this stage. + message(STATUS "WARNING: The test_wish_standard_examples target can be run independently but + it segfaults at the end so it is temporarily excluded from being a dependency + of other more general interactive test targets") # list(APPEND targets_examples_tk test_wish_standard_examples) if(ENABLE_itk) @@ -1021,8 +1026,15 @@ if(FILE_DEPENDS_xwin) add_dependencies(test_tk_02 test_xwin_dyndriver) endif(FILE_DEPENDS_xwin) - list(APPEND targets_examples_tk test_tk_02) - + + if(USE_INCRTCL_VERSION_4) + message(STATUS "WARNING: The test_tk_02 target can be run independently but it currently + does not work for version 4 of Itcl and friends so it is temporarily excluded + from being a dependency of other more general interactive test targets") + else(USE_INCRTCL_VERSION_4) + list(APPEND targets_examples_tk test_tk_02) + endif(USE_INCRTCL_VERSION_4) + add_custom_target(test_tk_04 COMMAND xtk04 -f ${CMAKE_CURRENT_BINARY_DIR}/tk/tk04 DEPENDS ${xwin_target} @@ -1035,9 +1047,14 @@ if(FILE_DEPENDS_xwin) add_dependencies(test_tk_04 test_xwin_dyndriver) endif(FILE_DEPENDS_xwin) - list(APPEND targets_examples_tk test_tk_04) + if(USE_INCRTCL_VERSION_4) + message(STATUS "WARNING: The test_tk_04 target can be run independently but it currently + does not work for version 4 of Itcl and friends so it is temporarily excluded + from being a dependency of other more general interactive test targets") + else(USE_INCRTCL_VERSION_4) + list(APPEND targets_examples_tk test_tk_04) + endif(USE_INCRTCL_VERSION_4) endif(ENABLE_itk) - endif(ENABLE_tk AND PLD_tk) if(targets_examples_tk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-11-28 06:10:52
|
Revision: 12774 http://sourceforge.net/p/plplot/code/12774 Author: airwin Date: 2013-11-28 06:10:49 +0000 (Thu, 28 Nov 2013) Log Message: ----------- Change some target names to a more consistent naming convention: test_tcl_standard_examples ==> test_pltcl_standard_examples test_tk_standard_examples ==> test_plserver_standard_examples Make sure the targets test_tclsh_standard_examples, test_wish_standard_examples, and test_wish_runAllDemos are only configured for the case when BUILD_SHARED_LIBS is true because from experiment the "package require" method of dynamically loading Tcl extension modules only works for shared objects. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2013-11-28 06:00:42 UTC (rev 12773) +++ trunk/examples/CMakeLists.txt 2013-11-28 06:10:49 UTC (rev 12774) @@ -1,7 +1,7 @@ # examples/CMakeLists.txt ### Process this file with cmake to produce Makefile ### -# Copyright (C) 2006-2012 Alan W. Irwin +# Copyright (C) 2006-2013 Alan W. Irwin # # This file is part of PLplot. # @@ -423,7 +423,7 @@ set(plplot_test_debug) endif(VALGRIND_ALL_TESTS) else(VALGRIND_EXECUTABLE) - set(plplot_test_debug) + set(plplot_test_debug) endif(VALGRIND_EXECUTABLE) if(CORE_BUILD) @@ -869,38 +869,41 @@ endif(ENABLE_pygcw) if(ENABLE_tcl AND PLD_xwin) - add_custom_target(test_tcl_standard_examples + add_custom_target(test_pltcl_standard_examples COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tcl/standard_examples -dev xwin -np DEPENDS ${xwin_target} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tcl ) - add_dependencies(test_tcl_standard_examples + add_dependencies(test_pltcl_standard_examples pltcl tcl_examples tclIndex_tcl xwin ) if(FILE_DEPENDS_xwin) - add_dependencies(test_tcl_standard_examples test_xwin_dyndriver) + add_dependencies(test_pltcl_standard_examples test_xwin_dyndriver) endif(FILE_DEPENDS_xwin) - list(APPEND interactive_targets_LIST test_tcl_standard_examples) + list(APPEND interactive_targets_LIST test_pltcl_standard_examples) - add_custom_target(test_tclsh_standard_examples - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tcl/tclsh_standard_examples - DEPENDS ${xwin_target} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tcl - ) - add_dependencies(test_tclsh_standard_examples - plplottcltk${LIB_TAG} - tcl_examples - tclIndex_tcl - xwin - ) - if(FILE_DEPENDS_xwin) - add_dependencies(test_tclsh_standard_examples test_xwin_dyndriver) - endif(FILE_DEPENDS_xwin) - list(APPEND interactive_targets_LIST test_tclsh_standard_examples) - + if(BUILD_SHARED_LIBS) + # tests that use "package require Pltcl" only work if + # BUILD_SHARED_LIBS is true. + add_custom_target(test_tclsh_standard_examples + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tcl/tclsh_standard_examples + DEPENDS ${xwin_target} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tcl + ) + add_dependencies(test_tclsh_standard_examples + plplottcltk${LIB_TAG} + tcl_examples + tclIndex_tcl + xwin + ) + if(FILE_DEPENDS_xwin) + add_dependencies(test_tclsh_standard_examples test_xwin_dyndriver) + endif(FILE_DEPENDS_xwin) + list(APPEND interactive_targets_LIST test_tclsh_standard_examples) + endif(BUILD_SHARED_LIBS) endif(ENABLE_tcl AND PLD_xwin) if(ENABLE_tk AND PLD_tk) @@ -960,12 +963,12 @@ endif(FILE_DEPENDS_xwin) list(APPEND targets_examples_tk test_tk_plgrid) - add_custom_target(test_tk_standard_examples + add_custom_target(test_plserver_standard_examples COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/standard_examples DEPENDS ${xwin_target} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk ) - add_dependencies(test_tk_standard_examples + add_dependencies(test_plserver_standard_examples plserver tcl_examples tclIndex_tcl @@ -974,38 +977,42 @@ xwin ) if(FILE_DEPENDS_xwin) - add_dependencies(test_tk_standard_examples test_xwin_dyndriver) + add_dependencies(test_plserver_standard_examples test_xwin_dyndriver) endif(FILE_DEPENDS_xwin) - list(APPEND targets_examples_tk test_tk_standard_examples) + list(APPEND targets_examples_tk test_plserver_standard_examples) - add_custom_target(test_wish_standard_examples - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/wish_standard_examples -geometry 800x600 - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk - ) - add_dependencies(test_wish_standard_examples - plplottcltk${LIB_TAG} - tk - xwin - tcl_examples - tclIndex_tcl - tclIndex_tk - tclIndex_examples_tk - ) - if(FILE_DEPENDS_xwin) - add_dependencies(test_wish_standard_examples test_xwin_dyndriver) - endif(FILE_DEPENDS_xwin) - # Temporarily suspend adding this target to the rest of the Tk - # interactive targets (and therefore also this target is not added - # to the overall list of targets run by the test_interactive - # target) because of a segfault generated by this target. The - # cause of that segfault is the Tcl exit command is somehow not - # compatible with how we have implemented the Tcl plframe command - # that is run by tkdemos.tcl in the wish case, but that is as much - # as we know at this stage. - message(STATUS "WARNING: The test_wish_standard_examples target can be run independently but + if(BUILD_SHARED_LIBS) + # tests that use "package require Pltk" only work if + # BUILD_SHARED_LIBS is true. + add_custom_target(test_wish_standard_examples + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/wish_standard_examples -geometry 800x600 + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk + ) + add_dependencies(test_wish_standard_examples + plplottcltk${LIB_TAG} + tk + xwin + tcl_examples + tclIndex_tcl + tclIndex_tk + tclIndex_examples_tk + ) + if(FILE_DEPENDS_xwin) + add_dependencies(test_wish_standard_examples test_xwin_dyndriver) + endif(FILE_DEPENDS_xwin) + # Temporarily suspend adding this target to the rest of the Tk + # interactive targets (and therefore also this target is not added + # to the overall list of targets run by the test_interactive + # target) because of a segfault generated by this target. The + # cause of that segfault is the Tcl exit command is somehow not + # compatible with how we have implemented the Tcl plframe command + # that is run by tkdemos.tcl in the wish case, but that is as much + # as we know at this stage. + message(STATUS "WARNING: The test_wish_standard_examples target can be run independently but it segfaults at the end so it is temporarily excluded from being a dependency of other more general interactive test targets") - # list(APPEND targets_examples_tk test_wish_standard_examples) + # list(APPEND targets_examples_tk test_wish_standard_examples) + endif(BUILD_SHARED_LIBS) if(ENABLE_itk) add_custom_target(test_tk_02 @@ -1059,6 +1066,7 @@ tclIndex_tcl tclIndex_tk tclIndex_examples_tk + xwin ) message(STATUS "WARNING: The test_plserver_runAlldemos target can be run independently but @@ -1066,22 +1074,26 @@ dependency of other more general interactive test targets") #list(APPEND targets_examples_tk test_plserver_runAllDemos) - add_custom_target(test_wish_runAllDemos - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/wish_runAllDemos -geometry 800x600 - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk - ) - add_dependencies(test_wish_runAllDemos - plplottcltk${LIB_TAG} - tkwin - tcl_examples - tclIndex_tcl - tclIndex_tk - tclIndex_examples_tk - ) - message(STATUS "WARNING: The test_wish_runAlldemos target can be run independently but + if(BUILD_SHARED_LIBS) + # tests that use "package require Plplotter" only work if + # BUILD_SHARED_LIBS is true. + add_custom_target(test_wish_runAllDemos + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/wish_runAllDemos -geometry 800x600 + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk + ) + add_dependencies(test_wish_runAllDemos + plplottcltk${LIB_TAG} + tkwin + tcl_examples + tclIndex_tcl + tclIndex_tk + tclIndex_examples_tk + ) + message(STATUS "WARNING: The test_wish_runAlldemos target can be run independently but there are several issues with this target so it is temporarily excluded from being a dependency of other more general interactive test targets") - # list(APPEND targets_examples_tk test_wish_runAlldemos) + # list(APPEND targets_examples_tk test_wish_runAlldemos) + endif(BUILD_SHARED_LIBS) endif(ENABLE_itk) endif(ENABLE_tk AND PLD_tk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-13 03:13:33
|
Revision: 12936 http://sourceforge.net/p/plplot/code/12936 Author: airwin Date: 2014-01-13 03:13:30 +0000 (Mon, 13 Jan 2014) Log Message: ----------- Choose ntk (if available) over wingcc as the device used for generic interactive tests on Windows. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2014-01-13 03:11:05 UTC (rev 12935) +++ trunk/examples/CMakeLists.txt 2014-01-13 03:13:30 UTC (rev 12936) @@ -423,13 +423,12 @@ if(PLD_xwin) # Typically for Unix with X set(generic_interactive_device xwin) +elseif(PLD_ntk) + # Typically for all platforms if ntk is available but not xwin + set(generic_interactive_device ntk) elseif(PLD_wingcc) - # Typically for Windows without X + # Typically for Windows if -dev ntk is not available set(generic_interactive_device wingcc) -elseif(PLD_ntk) - # A special test case used on Unix for when we have deliberately not - # looked for X simply to test the non-X logic. - set(generic_interactive_device ntk) else(PLD_xwin) set(generic_interactive_device) endif(PLD_xwin) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-16 05:44:30
|
Revision: 12944 http://sourceforge.net/p/plplot/code/12944 Author: airwin Date: 2014-01-16 05:44:27 +0000 (Thu, 16 Jan 2014) Log Message: ----------- Remove (now-)redundant -geometry options from wish test targets. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2014-01-15 23:13:47 UTC (rev 12943) +++ trunk/examples/CMakeLists.txt 2014-01-16 05:44:27 UTC (rev 12944) @@ -1037,7 +1037,7 @@ # tests that use "package require Pltk" only work if # BUILD_SHARED_LIBS is true. add_custom_target(test_wish_standard_examples - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/wish_standard_examples -geometry 800x600 + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/wish_standard_examples WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk ) add_dependencies(test_wish_standard_examples @@ -1130,7 +1130,7 @@ # tests that use "package require Plplotter" only work if # BUILD_SHARED_LIBS is true. add_custom_target(test_wish_runAllDemos - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/wish_runAllDemos -geometry 800x600 + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/wish_runAllDemos WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk ) add_dependencies(test_wish_runAllDemos This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-12 05:25:08
|
Revision: 13049 http://sourceforge.net/p/plplot/code/13049 Author: airwin Date: 2014-03-12 05:25:04 +0000 (Wed, 12 Mar 2014) Log Message: ----------- Until http://sourceforge.net/p/plplot/bugs/144/ is fixed, temporarily remove test_pltcl_standard_examples as a dependency of more general test targets on the affected platforms (only WIN32_AND_NOT_CYGWIN as far as I can tell) so those more general targets do not error out because of this bug. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2014-03-09 19:12:43 UTC (rev 13048) +++ trunk/examples/CMakeLists.txt 2014-03-12 05:25:04 UTC (rev 13049) @@ -934,7 +934,14 @@ if(FILE_DEPENDS_${generic_interactive_device}) add_dependencies(test_pltcl_standard_examples test_${generic_interactive_device}_dyndriver) endif(FILE_DEPENDS_${generic_interactive_device}) - list(APPEND interactive_targets_LIST test_pltcl_standard_examples) + if(WIN32_AND_NOT_CYGWIN) + message(STATUS "WARNING: The test_pltcl_standard_examples target can be run independently on + the Windows platform, but it generates an unhandled exception at the end so + it is temporarily excluded from being a dependency of other more general + interactive test targets") + else(WIN32_AND_NOT_CYGWIN) + list(APPEND interactive_targets_LIST test_pltcl_standard_examples) + endif(WIN32_AND_NOT_CYGWIN) if(BUILD_SHARED_LIBS) # tests that use "package require Pltcl" only work if This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-05-14 10:44:31
|
Revision: 13117 http://sourceforge.net/p/plplot/code/13117 Author: airwin Date: 2014-05-14 10:44:26 +0000 (Wed, 14 May 2014) Log Message: ----------- Judiciously sprinkle the "env" command around so that bash scripts are recognized properly for the "MinGW Makefiles" case. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2014-05-14 05:45:44 UTC (rev 13116) +++ trunk/examples/CMakeLists.txt 2014-05-14 10:44:26 UTC (rev 13117) @@ -945,7 +945,7 @@ if(ENABLE_tcl AND PLD_${generic_interactive_device}) add_custom_target(test_pltcl_standard_examples - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tcl/pltcl_standard_examples -dev ${generic_interactive_device} -np + COMMAND env ${CMAKE_CURRENT_BINARY_DIR}/tcl/pltcl_standard_examples -dev ${generic_interactive_device} -np DEPENDS ${${generic_interactive_device}_target} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tcl ) @@ -971,7 +971,7 @@ # tests that use "package require Pltcl" only work if # BUILD_SHARED_LIBS is true. add_custom_target(test_tclsh_standard_examples - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tcl/tclsh_standard_examples + COMMAND env ${CMAKE_CURRENT_BINARY_DIR}/tcl/tclsh_standard_examples DEPENDS ${${generic_interactive_device}_target} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tcl ) @@ -1046,7 +1046,7 @@ list(APPEND targets_examples_tk test_tk_plgrid) add_custom_target(test_plserver_standard_examples - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/plserver_standard_examples + COMMAND env ${CMAKE_CURRENT_BINARY_DIR}/tk/plserver_standard_examples DEPENDS ${xwin_target} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk ) @@ -1067,7 +1067,7 @@ # tests that use "package require Pltk" only work if # BUILD_SHARED_LIBS is true. add_custom_target(test_wish_standard_examples - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/wish_standard_examples + COMMAND env ${CMAKE_CURRENT_BINARY_DIR}/tk/wish_standard_examples WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk ) add_dependencies(test_wish_standard_examples @@ -1139,7 +1139,7 @@ endif(USE_INCRTCL_VERSION_4) add_custom_target(test_plserver_runAllDemos - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/plserver_runAllDemos + COMMAND env ${CMAKE_CURRENT_BINARY_DIR}/tk/plserver_runAllDemos WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk ) add_dependencies(test_plserver_runAllDemos @@ -1160,7 +1160,7 @@ # tests that use "package require Plplotter" only work if # BUILD_SHARED_LIBS is true. add_custom_target(test_wish_runAllDemos - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/wish_runAllDemos + COMMAND env ${CMAKE_CURRENT_BINARY_DIR}/tk/wish_runAllDemos WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk ) add_dependencies(test_wish_runAllDemos This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-05-18 21:53:31
|
Revision: 13122 http://sourceforge.net/p/plplot/code/13122 Author: airwin Date: 2014-05-18 21:53:26 +0000 (Sun, 18 May 2014) Log Message: ----------- Put test_noninteractive target example results in their own exclusive directory in the build tree which keeps the examples subdirectory of the build tree much cleaner and makes it easier to see how well the "make clean" command is cleaning up these files. The test_teclsh_standard_examples target has a showstopper Tcl exit problem (a non-zero return code) for certain configuration conditions (non-dynamic devices) on Windows. Therefore, to keep this showstopper error from propagating to the overall testing target, test_noninteractive, drop including the test_tclsh_standard_examples target as part of the list of dependencies for that overall target on Windows until this additional Tcl exit issue can be addressed. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2014-05-18 21:42:04 UTC (rev 13121) +++ trunk/examples/CMakeLists.txt 2014-05-18 21:53:26 UTC (rev 13122) @@ -475,14 +475,16 @@ set(plplot_test_debug) endif(VALGRIND_EXECUTABLE) + set(TEST_EXAMPLES_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/test_examples_output_dir) + file(MAKE_DIRECTORY ${TEST_EXAMPLES_OUTPUT_DIR}) if(CORE_BUILD) set(custom_test_script ${CMAKE_BINARY_DIR}/plplot_test/plplot-test.sh) - set(custom_env EXAMPLES_DIR=${CMAKE_BINARY_DIR}/examples SRC_EXAMPLES_DIR=${CMAKE_SOURCE_DIR}/examples) + set(custom_env EXAMPLES_DIR=${CMAKE_BINARY_DIR}/examples SRC_EXAMPLES_DIR=${CMAKE_SOURCE_DIR}/examples OUTPUT_DIR=${TEST_EXAMPLES_OUTPUT_DIR}) set(java_custom_env ${custom_env} PLPLOT_JAVA_WRAP_DIR=${CMAKE_BINARY_DIR}/bindings/java/ PLPLOT_CLASSPATH=${CMAKE_BINARY_DIR}/examples/java/plplot.jar) set(compare_script ${CMAKE_BINARY_DIR}/plplot_test/test_diff.sh) else(CORE_BUILD) set(custom_test_script ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh) - set(custom_env SRC_EXAMPLES_DIR=${CMAKE_CURRENT_SOURCE_DIR}) + set(custom_env SRC_EXAMPLES_DIR=${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_DIR=${TEST_EXAMPLES_OUTPUT_DIR}) set(java_custom_env ${custom_env}) set(compare_script ${CMAKE_CURRENT_SOURCE_DIR}/test_diff.sh) endif(CORE_BUILD) @@ -544,7 +546,7 @@ set(environment ${custom_env}) endif(language STREQUAL "java") - list_example_files(${CMAKE_CURRENT_BINARY_DIR} psc ${suffix} output_list) + list_example_files(${TEST_EXAMPLES_OUTPUT_DIR} psc ${suffix} output_list) add_custom_command( OUTPUT ${output_list} COMMAND ${CMAKE_COMMAND} -E echo "Generate ${language} results for psc device" @@ -577,6 +579,7 @@ # a comparison of stdout and PostScript results. add_custom_target(test_diff_psc COMMAND ${compare_command} DEPENDS ${diff_files_LIST} + WORKING_DIRECTORY ${TEST_EXAMPLES_OUTPUT_DIR} ) add_dependencies(test_diff_psc ${diff_targets_LIST}) set(noninteractive_targets_LIST test_diff_psc) @@ -626,7 +629,7 @@ ) endif(ENABLE_DYNDRIVERS) #message("DEBUG:file_device_depends_${device} = ${file_device_depends_${device}}") - list_example_files(${CMAKE_CURRENT_BINARY_DIR} ${device} c output_list) + list_example_files(${TEST_EXAMPLES_OUTPUT_DIR} ${device} c output_list) add_custom_command( OUTPUT ${output_list} COMMAND ${CMAKE_COMMAND} -E echo "Generate C results for ${device} file device" @@ -984,7 +987,15 @@ if(FILE_DEPENDS_${generic_interactive_device}) add_dependencies(test_tclsh_standard_examples test_${generic_interactive_device}_dyndriver) endif(FILE_DEPENDS_${generic_interactive_device}) - list(APPEND interactive_targets_LIST test_tclsh_standard_examples) + if(WIN32_AND_NOT_CYGWIN) + message(STATUS "WARNING: The test_tclsh_standard_examples target can be run independently on + the Windows platform, but for the nondynamic drivers case the exit + command generates a non-zero return code so until this issue is + dealt with this target is excluded from being a dependency of other + more general interactive test targets") + else(WIN32_AND_NOT_CYGWIN) + list(APPEND interactive_targets_LIST test_tclsh_standard_examples) + endif(WIN32_AND_NOT_CYGWIN) endif(BUILD_SHARED_LIBS) endif(ENABLE_tcl AND PLD_${generic_interactive_device}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |