From: <ai...@us...> - 2009-02-01 03:00:51
|
Revision: 9425 http://plplot.svn.sourceforge.net/plplot/?rev=9425&view=rev Author: airwin Date: 2009-02-01 03:00:48 +0000 (Sun, 01 Feb 2009) Log Message: ----------- Add Lua examples to test target in Makefile for installed examples. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-02-01 01:28:28 UTC (rev 9424) +++ trunk/examples/CMakeLists.txt 2009-02-01 03:00:48 UTC (rev 9425) @@ -130,6 +130,10 @@ set(PSC_TCL_COMMENT "#") endif(NOT ENABLE_tcl) + if(NOT ENABLE_lua) + set(PSC_LUA_COMMENT "#") + endif(NOT ENABLE_lua) + else(PLD_ps) set(PSC_ADA_COMMENT "#") set(PSC_C_COMMENT "#") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-02-01 20:56:29
|
Revision: 9430 http://plplot.svn.sourceforge.net/plplot/?rev=9430&view=rev Author: airwin Date: 2009-02-01 20:56:25 +0000 (Sun, 01 Feb 2009) Log Message: ----------- Implement tk configuration logic. Simplify compare configuration logic. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-02-01 19:48:18 UTC (rev 9429) +++ trunk/examples/CMakeLists.txt 2009-02-01 20:56:25 UTC (rev 9430) @@ -148,6 +148,10 @@ set(PSC_TCL_COMMENT "#") endif(PLD_ps) +if(NOT ENABLE_tk) + set(TK_COMMENT "#") +endif(NOT ENABLE_tk) + if(NOT PLD_pdfcairo) set(PDFCAIRO_COMMENT "#") endif(NOT PLD_pdfcairo) @@ -192,11 +196,9 @@ set(PSTEX_COMMENT "#") endif(NOT PLD_pstex) -if(DIFF_EXECUTABLE AND TAIL_EXECUTABLE) - set(COMPARE compare) -else(DIFF_EXECUTABLE AND TAIL_EXECUTABLE) +if(NOT DIFF_EXECUTABLE OR NOT TAIL_EXECUTABLE) set(COMPARE_COMMENT "#") -endif(DIFF_EXECUTABLE AND TAIL_EXECUTABLE) +endif(NOT DIFF_EXECUTABLE OR NOT TAIL_EXECUTABLE) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Makefile.examples.in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sm...@us...> - 2009-05-02 11:31:36
|
Revision: 9880 http://plplot.svn.sourceforge.net/plplot/?rev=9880&view=rev Author: smekal Date: 2009-05-02 11:31:27 +0000 (Sat, 02 May 2009) Log Message: ----------- Subdirectory d was included two times. Removed one occurence. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-05-02 06:17:06 UTC (rev 9879) +++ trunk/examples/CMakeLists.txt 2009-05-02 11:31:27 UTC (rev 9880) @@ -91,9 +91,6 @@ if(ENABLE_lua) add_subdirectory(lua) endif(ENABLE_lua) -if(ENABLE_d) - add_subdirectory(d) -endif(ENABLE_d) # Configure Makefile.examples with some specific variables This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-03 11:15:01
|
Revision: 9889 http://plplot.svn.sourceforge.net/plplot/?rev=9889&view=rev Author: airwin Date: 2009-05-03 11:14:52 +0000 (Sun, 03 May 2009) Log Message: ----------- Use correct rpath command for qt_example and -DENABLE_DYNDRIVERS=OFF case. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-05-03 11:14:05 UTC (rev 9888) +++ trunk/examples/CMakeLists.txt 2009-05-03 11:14:52 UTC (rev 9889) @@ -24,9 +24,13 @@ string(REGEX REPLACE ";" ":" LIB_INSTALL_RPATH "${_LIB_INSTALL_RPATH}") set(RPATHCMD "-Wl,-rpath -Wl,${LIB_INSTALL_RPATH}") if(PLD_extqt) - 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}") + 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}") + else(ENABLE_DYNDRIVERS) + set(qt_RPATHCMD ${RPATHCMD}) + endif(ENABLE_DYNDRIVERS) endif(PLD_extqt) endif(USE_RPATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-12 21:53:01
|
Revision: 9975 http://plplot.svn.sourceforge.net/plplot/?rev=9975&view=rev Author: airwin Date: 2009-05-12 21:52:53 +0000 (Tue, 12 May 2009) Log Message: ----------- Improve logic for choosing install tree language support files. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-05-12 21:49:54 UTC (rev 9974) +++ trunk/examples/CMakeLists.txt 2009-05-12 21:52:53 UTC (rev 9975) @@ -281,22 +281,32 @@ # Install PLplot-specific language support files needed for CMake-based # build of installed examples. -set(LANG_SUPPORT_FILES - CMakeD_Copyright.txt - CMakeDCompiler.cmake.in - CMakeDInformation.cmake - CMakeDetermineDCompiler.cmake - CMakeTestDCompiler.cmake +set(LANG_SUPPORT_FILES) - CMakeAdaCompiler.cmake.in - CMakeAdaInformation.cmake - CMakeDetermineAdaCompiler.cmake - CMakeTestAdaCompiler.cmake - ) +if(ENABLE_d) + set(LANG_SUPPORT_FILES ${LANG_SUPPORT_FILES} + CMakeD_Copyright.txt + CMakeDCompiler.cmake.in + CMakeDInformation.cmake + CMakeDetermineDCompiler.cmake + CMakeTestDCompiler.cmake + ) +endif(ENABLE_d) -foreach(LANG_SUPPORT_FILE ${LANG_SUPPORT_FILES}) - install(FILES - ${CMAKE_SOURCE_DIR}/cmake/modules/${LANG_SUPPORT_FILE} - DESTINATION ${DATA_DIR}/examples/cmake/modules +if(ENABLE_ada) + set(LANG_SUPPORT_FILES ${LANG_SUPPORT_FILES} + CMakeAdaCompiler.cmake.in + CMakeAdaInformation.cmake + CMakeDetermineAdaCompiler.cmake + CMakeTestAdaCompiler.cmake ) -endforeach(LANG_SUPPORT_FILE ${LANG_SUPPORT_FILES}) +endif(ENABLE_ada) + +if(LANG_SUPPORT_FILES) + foreach(LANG_SUPPORT_FILE ${LANG_SUPPORT_FILES}) + install(FILES + ${CMAKE_SOURCE_DIR}/cmake/modules/${LANG_SUPPORT_FILE} + DESTINATION ${DATA_DIR}/examples/cmake/modules + ) + endforeach(LANG_SUPPORT_FILE ${LANG_SUPPORT_FILES}) +endif(LANG_SUPPORT_FILES) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-09-20 17:56:23
|
Revision: 10437 http://plplot.svn.sourceforge.net/plplot/?rev=10437&view=rev Author: airwin Date: 2009-09-20 17:56:16 +0000 (Sun, 20 Sep 2009) Log Message: ----------- Install soft-landing support for compiler detection/testing. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-09-20 16:35:40 UTC (rev 10436) +++ trunk/examples/CMakeLists.txt 2009-09-20 17:56:16 UTC (rev 10437) @@ -277,6 +277,12 @@ DESTINATION ${DATA_DIR}/examples/cmake/modules ) + # Install soft-landing support for compiler detection/testing. + install(FILES + ${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. # N.B. This list of files must be maintained consistently with the file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-10-24 20:36:47
|
Revision: 10549 http://plplot.svn.sourceforge.net/plplot/?rev=10549&view=rev Author: airwin Date: 2009-10-24 20:36:39 +0000 (Sat, 24 Oct 2009) Log Message: ----------- Create test_c_extcairo target and add it to test_noninteractive target dependencies. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-10-24 17:26:14 UTC (rev 10548) +++ trunk/examples/CMakeLists.txt 2009-10-24 20:36:39 UTC (rev 10549) @@ -544,6 +544,19 @@ list(APPEND noninteractive_targets_LIST test_c_${device}) endforeach(file_devices_info ${FILE_DEVICES_LIST}) + if(PLD_extcairo) + get_target_property(ext-cairo-test_LOCATION ext-cairo-test LOCATION) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ext-cairo-test.ps + COMMAND ${ext-cairo-test_LOCATION} + DEPENDS ext-cairo-test + ) + add_custom_target(test_c_extcairo + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ext-cairo-test.ps + ) + list(APPEND noninteractive_targets_LIST test_c_extcairo) + endif(PLD_extcairo) + add_custom_target(test_noninteractive) if(noninteractive_targets_LIST) add_dependencies(test_noninteractive ${noninteractive_targets_LIST}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-10-27 19:49:17
|
Revision: 10557 http://plplot.svn.sourceforge.net/plplot/?rev=10557&view=rev Author: airwin Date: 2009-10-27 19:49:11 +0000 (Tue, 27 Oct 2009) Log Message: ----------- Move to style which uses targets for COMMANDs for all special targets used in tests. extXdrawable_demo depends on PLD_xcairo and not PLD_extcairo. Add test_plplotcanvas_demo and test_plplotcanvas_animation interactive targets. (These complete the tests of all special targets compiled in the c subdirectory.) Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-10-27 19:44:54 UTC (rev 10556) +++ trunk/examples/CMakeLists.txt 2009-10-27 19:49:11 UTC (rev 10557) @@ -545,16 +545,17 @@ endforeach(file_devices_info ${FILE_DEVICES_LIST}) if(PLD_extcairo) - get_target_property(ext-cairo-test_LOCATION ext-cairo-test LOCATION) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ext-cairo-test.ps - COMMAND ${ext-cairo-test_LOCATION} - DEPENDS ext-cairo-test + COMMAND ext-cairo-test + DEPENDS + ext-cairo-test + cairo ) - add_custom_target(test_c_extcairo + add_custom_target(test_extcairo DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ext-cairo-test.ps ) - list(APPEND noninteractive_targets_LIST test_c_extcairo) + list(APPEND noninteractive_targets_LIST test_extcairo) endif(PLD_extcairo) add_custom_target(test_noninteractive) @@ -586,15 +587,34 @@ list(APPEND interactive_targets_LIST test_c_${device}) endforeach(interactive_devices_info ${INTERACTIVE_DEVICES_LIST}) - if(PLD_extcairo) - get_target_property(extXdrawable_demo_LOCATION extXdrawable_demo LOCATION) + if(PLD_xcairo) add_custom_target(test_extXdrawable - COMMAND ${extXdrawable_demo_LOCATION} - DEPENDS extXdrawable_demo + COMMAND extXdrawable_demo + DEPENDS + extXdrawable_demo + cairo ) list(APPEND interactive_targets_LIST test_extXdrawable) - endif(PLD_extcairo) + endif(PLD_xcairo) + if(ENABLE_gnome2) + add_custom_target(test_plplotcanvas_demo + COMMAND plplotcanvas_demo + 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) + endif(ENABLE_gnome2) + endif(ENABLE_c) add_custom_target(test_interactive) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-11-10 19:13:51
|
Revision: 10579 http://plplot.svn.sourceforge.net/plplot/?rev=10579&view=rev Author: airwin Date: 2009-11-10 19:13:35 +0000 (Tue, 10 Nov 2009) Log Message: ----------- Fix test_c_tk target dependencies. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-11-10 19:04:24 UTC (rev 10578) +++ trunk/examples/CMakeLists.txt 2009-11-10 19:13:35 UTC (rev 10579) @@ -584,6 +584,13 @@ DEPENDS ${interactive_device_depends_${device}} ) + if(device STREQUAL "tk") + if(CORE_BUILD) + add_dependencies(test_c_tk tclIndex_tk tclIndex_tcl plserver xwin) + else(CORE_BUILD) + add_dependencies(test_c_tk plserver xwin) + endif(CORE_BUILD) + endif(device STREQUAL "tk") list(APPEND interactive_targets_LIST test_c_${device}) endforeach(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-01-04 00:28:20
|
Revision: 10734 http://plplot.svn.sourceforge.net/plplot/?rev=10734&view=rev Author: airwin Date: 2010-01-04 00:27:58 +0000 (Mon, 04 Jan 2010) Log Message: ----------- There is a non-VERBATIM custom command issue with CMake where the first part of the command is surrounded by quotes if there is an embedded blank. Work around this issue by using an initial part of the command that does nothing and which has no embedded blanks. The Linux result is that the embedded blanks in the remaining parts of the command are replaced by escaped blanks, i.e., "\ ", which works well. This needs to be tested on other platforms for the case where any/all of the source, build, or install trees have embedded blanks in the top-level directory name. N.B. I cannot use VERBATIM custom commands here since they have a bug where all parts of the command that are variable assignments that contain an embedded blank are surrounded by quotes. See further discussion on the CMake list as of 2010-01-03. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2010-01-04 00:16:18 UTC (rev 10733) +++ trunk/examples/CMakeLists.txt 2010-01-04 00:27:58 UTC (rev 10734) @@ -458,7 +458,7 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/x01${suffix}.psc COMMAND ${CMAKE_COMMAND} -E echo "Generate ${language} results for psc device" - COMMAND ${environment} ${custom_test_command} --verbose --front-end=${language} --device=psc + COMMAND DUMMY= ${environment} ${custom_test_command} --verbose --front-end=${language} --device=psc DEPENDS ${compare_file_depends_${language}} ) add_custom_target(test_${language}_psc @@ -534,7 +534,7 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/x01c${index}.${device} COMMAND ${CMAKE_COMMAND} -E echo "Generate C results for ${device} file device" - COMMAND ${custom_env} ${custom_test_command} --verbose --front-end=c --device=${device} + COMMAND DUMMY= ${custom_env} ${custom_test_command} --verbose --front-end=c --device=${device} DEPENDS ${file_device_depends_${device}} ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <ai...@us...> - 2013-07-01 03:59:31
|
Revision: 12397 http://sourceforge.net/p/plplot/code/12397 Author: airwin Date: 2013-07-01 03:59:28 +0000 (Mon, 01 Jul 2013) Log Message: ----------- Execute custom_test_script and command_script with ${SH_EXECUTABLE} so that "MinGW Makefiles" can run these scripts without issues. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2013-06-28 20:46:53 UTC (rev 12396) +++ trunk/examples/CMakeLists.txt 2013-07-01 03:59:28 UTC (rev 12397) @@ -421,19 +421,21 @@ ) if(CORE_BUILD) - set(custom_test_command ${CMAKE_BINARY_DIR}/plplot_test/plplot-test.sh) + 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(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_command ${CMAKE_BINARY_DIR}/plplot_test/test_diff.sh) + set(compare_script ${CMAKE_BINARY_DIR}/plplot_test/test_diff.sh) else(CORE_BUILD) - set(custom_test_command ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh) + set(custom_test_script ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh) set(custom_env SRC_EXAMPLES_DIR=${CMAKE_CURRENT_SOURCE_DIR}) set(java_custom_env ${custom_env}) - set(compare_command ${CMAKE_CURRENT_SOURCE_DIR}/test_diff.sh) + set(compare_script ${CMAKE_CURRENT_SOURCE_DIR}/test_diff.sh) endif(CORE_BUILD) + set(custom_test_command ${SH_EXECUTABLE} ${custom_test_script}) + set(compare_command ${SH_EXECUTABLE} ${compare_script}) if(PLD_psc) - set(compare_file_depends ${custom_test_command}) + set(compare_file_depends ${custom_test_script}) if(ENABLE_DYNDRIVERS) # The ps shared object implements both the psc (and ps) devices. get_property(FILE_DEPENDS_ps GLOBAL PROPERTY FILE_DEPENDS_ps_dyndriver) @@ -532,7 +534,7 @@ # ENABLE_c is always ON by construction, but test it anyway for # consistency sake. if(ENABLE_c) - set(device_depends ${custom_test_command}) + set(device_depends ${custom_test_script}) # See explanation above about what to do with files_examples_c and # targets_examples_c. if(files_examples_c) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-10-22 01:33:22
|
Revision: 12616 http://sourceforge.net/p/plplot/code/12616 Author: airwin Date: 2013-10-22 01:33:19 +0000 (Tue, 22 Oct 2013) Log Message: ----------- Implement a VALGRIND_ALL_TESTS option to use valgrind for all runs of plplot-test.sh. With this option, time make VERBOSE=1 -j4 test_c_psc >& test_c_psc.out takes 6 minutes to complete on a mediocre PC (5-yr old box with 2 real cpu's). Tested by Alan W. Irwin <ai...@us...> using the test_c_psc target on a 64-bit Linux system. The result was all examples were valgrind perfect, e.g., ==4688== HEAP SUMMARY: ==4688== in use at exit: 0 bytes in 0 blocks ==4688== total heap usage: 360 allocs, 360 frees, 122,385 bytes allocated ==4688== ==4688== All heap blocks were freed -- no leaks are possible ==4688== ==4688== For counts of detected and suppressed errors, rerun with: -v ==4688== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 4 from 4) except for x16c and x33c where valgrind showed plcolorbar memory management issues which I will now attempt to figure out. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2013-10-21 22:14:00 UTC (rev 12615) +++ trunk/examples/CMakeLists.txt 2013-10-22 01:33:19 UTC (rev 12616) @@ -420,6 +420,18 @@ ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm ) + find_program(VALGRIND_EXECUTABLE valgrind) + if(VALGRIND_EXECUTABLE) + option(VALGRIND_ALL_TESTS "Apply valgrind to all runs of plplot_test/plplot-test.sh" OFF) + if(VALGRIND_ALL_TESTS) + set(plplot_test_debug --debug) + else(VALGRIND_ALL_TESTS) + set(plplot_test_debug) + endif(VALGRIND_ALL_TESTS) + else(VALGRIND_EXECUTABLE) + set(plplot_test_debug) + endif(VALGRIND_EXECUTABLE) + 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) @@ -492,7 +504,7 @@ add_custom_command( OUTPUT ${output_list} COMMAND ${CMAKE_COMMAND} -E echo "Generate ${language} results for psc device" - COMMAND env ${environment} ${custom_test_command} --verbose --front-end=${language} --device=psc + COMMAND env ${environment} ${custom_test_command} --verbose --front-end=${language} --device=psc ${plplot_test_debug} DEPENDS ${compare_file_depends_${language}} VERBATIM ) @@ -574,7 +586,7 @@ add_custom_command( OUTPUT ${output_list} 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} + COMMAND env ${custom_env} ${custom_test_command} --verbose --front-end=c --device=${device} ${plplot_test_debug} DEPENDS ${file_device_depends_${device}} VERBATIM @@ -682,7 +694,7 @@ endif(ENABLE_DYNDRIVERS) add_custom_target(test_c_${device} COMMAND ${CMAKE_COMMAND} -E echo "Generate C results for ${device} interactive device" - COMMAND env ${custom_env} ${custom_test_command} --verbose --interactive --device=${device} + COMMAND env ${custom_env} ${custom_test_command} --verbose --interactive --device=${device} ${plplot_test_debug} DEPENDS ${interactive_device_depends_${device}} VERBATIM @@ -711,7 +723,7 @@ 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} + COMMAND env ${custom_env} ${custom_test_command} --verbose --interactive_octave --device=${device} ${plplot_test_debug} DEPENDS ${interactive_device_depends_${device}} ${files_examples_octave} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-11-16 21:36:51
|
Revision: 12707 http://sourceforge.net/p/plplot/code/12707 Author: airwin Date: 2013-11-16 21:36:48 +0000 (Sat, 16 Nov 2013) Log Message: ----------- There is a segfault generated by the Tcl exit command in the wish_standard_examples(.in) script that is still under investigation. Until that issue is resolved, still allow the test_wish_standard_examples target can be run directly to aid that investigation. But temporarily remove this target from the list of targets that are run automatically as dependencies of the test_interactive target so the segfault does not interfere with the running those other targets. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2013-11-16 19:15:17 UTC (rev 12706) +++ trunk/examples/CMakeLists.txt 2013-11-16 21:36:48 UTC (rev 12707) @@ -998,7 +998,15 @@ if(FILE_DEPENDS_xwin) add_dependencies(test_wish_standard_examples test_xwin_dyndriver) endif(FILE_DEPENDS_xwin) - list(APPEND targets_examples_tk test_wish_standard_examples) + # 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. + # list(APPEND targets_examples_tk test_wish_standard_examples) if(ENABLE_itk) add_custom_target(test_tk_02 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-02-06 05:04:22
|
Revision: 12976 http://sourceforge.net/p/plplot/code/12976 Author: airwin Date: 2014-02-06 05:04:19 +0000 (Thu, 06 Feb 2014) Log Message: ----------- Install Darwin-dmd.cmake (which is likely necessary for the CMake-based build system for the installed D examples on Mac OS X). Make CMake minimum version and policy for the installed examples configuration consistent with the core configuration. Output CMAKE_PLATFORM_INFO_DIR since there has sometimes been trouble with that variable being defined. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2014-02-05 22:23:38 UTC (rev 12975) +++ trunk/examples/CMakeLists.txt 2014-02-06 05:04:19 UTC (rev 12976) @@ -360,10 +360,12 @@ language_support/cmake:CMakeDInformation.cmake language_support/cmake:CMakeDetermineDCompiler.cmake language_support/cmake:CMakeTestDCompiler.cmake - language_support/cmake/Platform:/Linux-dmd.cmake + language_support/cmake/Platform:Darwin-dmd.cmake + language_support/cmake/Platform:Linux-dmd.cmake language_support/cmake/Platform:Linux-gdc.cmake language_support/cmake/Platform:Windows-dmd.cmake language_support/cmake/Platform:Windows-gdc.cmake + language_support/cmake/Platform:Windows-gdc.cmake ) endif(ENABLE_d) @@ -383,23 +385,20 @@ message(STATUS "CMake version = ${CMAKE_VERSION}") message(STATUS "CMAKE_SYSTEM_NAME = ${CMAKE_SYSTEM_NAME}") - if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - # We prefer to support only the latest CMake version because it - # tends to be more free of issues and more consistent with recent - # software releases of software that PLplot depends on than earlier versions. - # However, as a special concession to our modern (not enterprise or - # LTS) Linux distro users so they can avoid a download of recent CMake, - # we allow them to use the system version of - # CMake which at this time (2011-10) is typically 2.8.2 or later. - cmake_minimum_required(VERSION 2.8.2 FATAL_ERROR) - else(CMAKE_SYSTEM_NAME STREQUAL "Linux") - # For non-Linux platforms we prefer to support only the most recent - # CMake version since that tends to be most free of issues and most - # consistent with releases of software that PLplot depends on. The - # most recently released CMake is 2.8.6 at this time (2011-10). - cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR) - endif(CMAKE_SYSTEM_NAME STREQUAL "Linux") + # The minimum version and policy settings normally follow what is + # done for the core build. Check the core build for the reasons for + # these decisions. + cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR) + if(POLICY CMP0022) + message(STATUS "Explicitly setting policy CMP0022 to OLD") + cmake_policy(SET CMP0022 OLD) + endif(POLICY CMP0022) + if(POLICY CMP0023) + message(STATUS "Explicitly setting policy CMP0023 to OLD") + cmake_policy(SET CMP0023 OLD) + endif(POLICY CMP0023) + message(STATUS "CMAKE_PLATFORM_INFO_DIR = ${CMAKE_PLATFORM_INFO_DIR}") # Locations where PLplot cmake build system first looks for cmake modules. set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-04-04 17:33:32
|
Revision: 13097 http://sourceforge.net/p/plplot/code/13097 Author: airwin Date: 2014-04-04 17:33:29 +0000 (Fri, 04 Apr 2014) Log Message: ----------- Solve name clash <https://sourceforge.net/p/plplot/bugs/146/> by replacing HAVE_CONFIG_H ==> PLPLOT_HAVE_CONFIG_H everywhere within our source tree. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2014-04-04 17:31:22 UTC (rev 13096) +++ trunk/examples/CMakeLists.txt 2014-04-04 17:33:29 UTC (rev 13097) @@ -414,7 +414,7 @@ endif(CORE_BUILD) if(CORE_BUILD AND BUILD_TEST) - remove_definitions("-DHAVE_CONFIG_H") + remove_definitions("-DPLPLOT_HAVE_CONFIG_H") endif(CORE_BUILD AND BUILD_TEST) # Decide on device to be used for generic interactive tests. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-07-19 19:29:16
|
Revision: 10163 http://plplot.svn.sourceforge.net/plplot/?rev=10163&view=rev Author: airwin Date: 2009-07-19 19:29:03 +0000 (Sun, 19 Jul 2009) Log Message: ----------- Update D and Fortran language support files for the installed examples build to be consistent with those for the core build. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-07-19 17:30:25 UTC (rev 10162) +++ trunk/examples/CMakeLists.txt 2009-07-19 19:29:03 UTC (rev 10163) @@ -287,12 +287,24 @@ ${CMAKE_SOURCE_DIR}/cmake/modules/FindPkgConfig.cmake DESTINATION ${DATA_DIR}/examples/cmake/modules ) - + # Install PLplot-specific language support files needed for CMake-based # build of installed examples. +# N.B. This list of files must be maintained consistently with the file +# lists in cmake/modules/language_support.cmake. set(LANG_SUPPORT_FILES) +set(PLATFORM_SUPPORT_FILES) +if(ENABLE_ada) + set(LANG_SUPPORT_FILES ${LANG_SUPPORT_FILES} + CMakeAdaCompiler.cmake.in + CMakeAdaInformation.cmake + CMakeDetermineAdaCompiler.cmake + CMakeTestAdaCompiler.cmake + ) +endif(ENABLE_ada) + if(ENABLE_d) set(LANG_SUPPORT_FILES ${LANG_SUPPORT_FILES} CMakeD_Copyright.txt @@ -301,16 +313,25 @@ CMakeDetermineDCompiler.cmake CMakeTestDCompiler.cmake ) + set(PLATFORM_SUPPORT_FILES ${PLATFORM_SUPPORT_FILES} + Platform/Linux-dmd.cmake + Platform/Linux-gdc.cmake + Platform/Windows-dmd.cmake + Platform/Windows-gdc.cmake + ) endif(ENABLE_d) -if(ENABLE_ada) +if(ENABLE_f77 OR ENABLE_f95) set(LANG_SUPPORT_FILES ${LANG_SUPPORT_FILES} - CMakeAdaCompiler.cmake.in - CMakeAdaInformation.cmake - CMakeDetermineAdaCompiler.cmake - CMakeTestAdaCompiler.cmake + CMakeFortranInformation.cmake ) -endif(ENABLE_ada) + set(PLATFORM_SUPPORT_FILES ${PLATFORM_SUPPORT_FILES} + Platform/Cygwin-GNU-Fortran.cmake + Platform/Windows-GNU-Fortran.cmake + Platform/Windows-df.cmake + Platform/Windows-f90.cmake + ) +endif(ENABLE_f77 OR ENABLE_f95) if(LANG_SUPPORT_FILES) foreach(LANG_SUPPORT_FILE ${LANG_SUPPORT_FILES}) @@ -320,3 +341,13 @@ ) endforeach(LANG_SUPPORT_FILE ${LANG_SUPPORT_FILES}) endif(LANG_SUPPORT_FILES) + +if(PLATFORM_SUPPORT_FILES) + foreach(PLATFORM_SUPPORT_FILE ${PLATFORM_SUPPORT_FILES}) + install(FILES + ${CMAKE_SOURCE_DIR}/cmake/modules/${PLATFORM_SUPPORT_FILE} + DESTINATION ${DATA_DIR}/examples/cmake/modules/Platform + ) + endforeach(PLATFORM_SUPPORT_FILE ${PLATFORM_SUPPORT_FILES}) +endif(PLATFORM_SUPPORT_FILES) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-09-20 16:35:49
|
Revision: 10436 http://plplot.svn.sourceforge.net/plplot/?rev=10436&view=rev Author: airwin Date: 2009-09-20 16:35:40 +0000 (Sun, 20 Sep 2009) Log Message: ----------- Always set the special PLD_psc and PLD_psttfc variables so they are always available to configure the installed examples build. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-09-20 00:22:43 UTC (rev 10435) +++ trunk/examples/CMakeLists.txt 2009-09-20 16:35:40 UTC (rev 10436) @@ -217,17 +217,14 @@ endif(CORE_BUILD) if(CORE_BUILD) - # These variables (normally not set or needed for a core build) - # are needed below for the tests of the languages and devices. - # For the installed examples tree case (where CORE_BUILD is not defined), - # these variables are set in the configured file - # (whose template is plplot_configure.cmake_installed_examples.in) that - # is installed as examples/cmake/module/plplot_configure.cmake. + # These variables (normally not set or needed for a core build) are + # needed below for the tests of the languages and devices. They + # are also needed to configure plplot_configure.cmake whose template + # file is plplot_configure.cmake_installed_examples.in and which + # ends up installed in examples/cmake/module. set(ENABLE_c ON) - if(BUILD_TEST) - set(PLD_psc ${PLD_ps}) - set(PLD_psttfc ${PLD_psttf}) - endif(BUILD_TEST) + set(PLD_psc ${PLD_ps}) + set(PLD_psttfc ${PLD_psttf}) # Start configuration/installation of CMake-based build system for # installed examples. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-09-30 17:12:24
|
Revision: 10496 http://plplot.svn.sourceforge.net/plplot/?rev=10496&view=rev Author: airwin Date: 2009-09-30 17:11:53 +0000 (Wed, 30 Sep 2009) Log Message: ----------- Remove test_some_diff_psc target which tends to encourage bogus multiple-target use of parallel builds. Rename important test_all_diff_psc target as test_diff_psc. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-09-30 17:00:35 UTC (rev 10495) +++ trunk/examples/CMakeLists.txt 2009-09-30 17:11:53 UTC (rev 10496) @@ -472,18 +472,12 @@ endif(ENABLE_${language}) endforeach(language_info ${language_info_LIST}) - # Note no target or file dependencies for test_some_diff_psc since - # we want to execute this target like it is done in ctest, i.e., - # whenever we like for whatever test_${language}_psc targets we - # have run first. - add_custom_target(test_some_diff_psc COMMAND ${compare_command}) - - # Note this target does have complete file and target dependencies to - # force a complete comparison of stdout and PostScript results. - add_custom_target(test_all_diff_psc COMMAND ${compare_command} + # Note this target has complete file and target dependencies for + # a comparison of stdout and PostScript results. + add_custom_target(test_diff_psc COMMAND ${compare_command} DEPENDS ${diff_files_LIST} ) - add_dependencies(test_all_diff_psc ${diff_targets_LIST}) + add_dependencies(test_diff_psc ${diff_targets_LIST}) endif(PLD_psc) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-10-12 23:43:03
|
Revision: 10531 http://plplot.svn.sourceforge.net/plplot/?rev=10531&view=rev Author: airwin Date: 2009-10-12 23:18:07 +0000 (Mon, 12 Oct 2009) Log Message: ----------- Improve implementation of test_noninteractive target so that it works both for a core build (with BUILD_TEST=ON) and installed examples. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-10-12 22:38:17 UTC (rev 10530) +++ trunk/examples/CMakeLists.txt 2009-10-12 23:18:07 UTC (rev 10531) @@ -225,6 +225,11 @@ set(ENABLE_c ON) set(PLD_psc ${PLD_ps}) set(PLD_psttfc ${PLD_psttf}) + # The psc device handled separately below so don't add it to + # FILE_DEVICES_LIST. + if(PLD_psttfc) + list(APPEND FILE_DEVICES_LIST psttfc:psttf:OFF) + endif(PLD_psttfc) # Start configuration/installation of CMake-based build system for # installed examples. @@ -389,21 +394,22 @@ ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm ) + if(CORE_BUILD) + set(custom_test_command ${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(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_command ${CMAKE_BINARY_DIR}/plplot_test/test_diff.sh) + else(CORE_BUILD) + set(custom_test_command ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh) + set(custom_env SRC_EXAMPLES_DIR=${CMAKE_CURRENT_SOURCE_DIR}) + set(java_custom_env ${custom_env}) + set(compare_command ${CMAKE_CURRENT_SOURCE_DIR}/test_diff.sh) + endif(CORE_BUILD) + if(PLD_psc) - if(CORE_BUILD) - set(custom_test_command ${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(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_command ${CMAKE_BINARY_DIR}/plplot_test/test_diff.sh) - else(CORE_BUILD) - set(custom_test_command ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh) - set(custom_env SRC_EXAMPLES_DIR=${CMAKE_CURRENT_SOURCE_DIR}) - set(java_custom_env ${custom_env}) - set(compare_command ${CMAKE_CURRENT_SOURCE_DIR}/test_diff.sh) - endif(CORE_BUILD) - 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) endif(ENABLE_DYNDRIVERS) @@ -478,50 +484,69 @@ DEPENDS ${diff_files_LIST} ) add_dependencies(test_diff_psc ${diff_targets_LIST}) - + set(noninteractive_targets_LIST test_diff_psc) + else(PLD_psc) + set(noninteractive_targets_LIST) endif(PLD_psc) - set(output_LIST) - # noninteractive_devices_info_LIST set in plplot_configure.cmake. Each list - # member consists of a colon-separated device name and a Boolean variable - # that indicates if device has familied output in plplot-test.sh. - - foreach(noninteractive_devices_info ${noninteractive_devices_info_LIST}) - string(REGEX REPLACE "^(.*):.*$" "\\1" device ${noninteractive_devices_info}) - string(REGEX REPLACE "^.*:(.*)$" "\\1" familied ${noninteractive_devices_info}) + # ENABLE_c is always ON by construction, but test it anyway for + # consistency sake. + if(ENABLE_c) + set(file_device_depends ${custom_test_command}) + if(files_examples_c) + list(APPEND file_device_depends ${files_examples_c}) + else(files_examples_c) + if(targets_examples_c) + list(APPEND file_device_depends ${targets_examples_c}) + endif(targets_examples_c) + endif(files_examples_c) - # If familying turned on for this device in plplot-test.sh, then the OUTPUT - # files appear in the form x??c??.${device} rather than x??c.${device}. - # Put in a representative placeholder for the familying index in the - # OUTPUT name. - if(familied) - set(index 01) - else(familied) - set(index) - endif(familied) - - # ENABLE_c is always ON by construction in plplot_configure.cmake, but - # make a logical test of it in any case just to be consistent with above - # ENABLE_${language} logic where c is one of the languages. - if(PLD_${device} AND ENABLE_c) + # FILE_DEVICES_LIST is set in cmake/modules/drivers-finish.cmake + # for all enabled devices and adjusted above for the special case + # of the psttfc device. It is also configured in + # plplot_configure.cmake. Each list member consists of a + # colon-separated device name, driver name, and a Boolean variable that + # indicates if device has familied output in plplot-test.sh. + # N.B. device psc is deliberately excluded from list because it is + # handled in a different way above. + foreach(file_devices_info ${FILE_DEVICES_LIST}) + string(REGEX REPLACE "^(.*):.*:.*$" "\\1" device ${file_devices_info}) + string(REGEX REPLACE "^.*:(.*):.*$" "\\1" driver ${file_devices_info}) + string(REGEX REPLACE "^.*:.*:(.*)$" "\\1" familied ${file_devices_info}) + + # If familying turned on for this device in plplot-test.sh, then the OUTPUT + # files appear in the form x??c??.${device} rather than x??c.${device}. + # Put in a representative placeholder for the familying index in the + # OUTPUT name. + if(familied) + set(index 01) + else(familied) + set(index) + endif(familied) + + set(file_device_depends_${device} ${file_device_depends}) + if(ENABLE_DYNDRIVERS) + list(APPEND file_device_depends_${device} ${driver}) + endif(ENABLE_DYNDRIVERS) #message("DEBUG: OUTPUT filename = x01c${index}.${device}") add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/x01c${index}.${device} - COMMAND ${CMAKE_COMMAND} -E echo "Generate C results for ${device} device" - COMMAND SRC_EXAMPLES_DIR=${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh --verbose --front-end=c --device=${device} + COMMAND ${CMAKE_COMMAND} -E echo "Generate C results for ${device} file device" + COMMAND ${custom_env} ${custom_test_command} --verbose --front-end=c --device=${device} DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh + ${file_device_depends_${device}} ) - list(APPEND output_LIST ${CMAKE_CURRENT_BINARY_DIR}/x01c${index}.${device}) - endif(PLD_${device} AND ENABLE_c) - endforeach(noninteractive_devices_info ${noninteractive_devices_info_LIST}) + add_custom_target(test_c_${device} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/x01c${index}.${device} + ) + list(APPEND noninteractive_targets_LIST test_c_${device}) + endforeach(file_devices_info ${FILE_DEVICES_LIST}) - add_custom_target(test_noninteractive - DEPENDS ${output_LIST} - ) - if(noninteractive_targets_LIST) - add_dependencies(test_noninteractive ${noninteractive_targets_LIST}) - endif(noninteractive_targets_LIST) + add_custom_target(test_noninteractive) + if(noninteractive_targets_LIST) + add_dependencies(test_noninteractive ${noninteractive_targets_LIST}) + endif(noninteractive_targets_LIST) + endif(ENABLE_c) set(interactive_targets_LIST ${targets_examples_c}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-10-24 23:46:28
|
Revision: 10550 http://plplot.svn.sourceforge.net/plplot/?rev=10550&view=rev Author: airwin Date: 2009-10-24 23:46:18 +0000 (Sat, 24 Oct 2009) Log Message: ----------- Create test_extXdrawable target and add it to dependencies of test_interactive. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-10-24 20:36:39 UTC (rev 10549) +++ trunk/examples/CMakeLists.txt 2009-10-24 23:46:18 UTC (rev 10550) @@ -586,14 +586,21 @@ list(APPEND interactive_targets_LIST test_c_${device}) endforeach(interactive_devices_info ${INTERACTIVE_DEVICES_LIST}) - add_custom_target(test_interactive) - if(interactive_targets_LIST) - add_dependencies(test_interactive ${interactive_targets_LIST}) - endif(interactive_targets_LIST) + if(PLD_extcairo) + get_target_property(extXdrawable_demo_LOCATION extXdrawable_demo LOCATION) + add_custom_target(test_extXdrawable + COMMAND ${extXdrawable_demo_LOCATION} + DEPENDS extXdrawable_demo + ) + list(APPEND interactive_targets_LIST test_extXdrawable) + endif(PLD_extcairo) endif(ENABLE_c) - set(interactive_targets_LIST ${targets_examples_c}) + 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}) @@ -629,14 +636,6 @@ list(APPEND interactive_targets_LIST ${target_qt_example}) endif(target_qt_example) -# add_custom_target(test_interactive -# COMMAND SRC_EXAMPLES_DIR=${CMAKE_CURRENT_SOURCE_DIR} EXAMPLES_DIR=${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test-interactive.sh -# ) - -# if(interactive_targets_LIST) -# add_dependencies(test_interactive ${interactive_targets_LIST}) -# endif(interactive_targets_LIST) - 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...> - 2009-10-28 00:30:33
|
Revision: 10559 http://plplot.svn.sourceforge.net/plplot/?rev=10559&view=rev Author: airwin Date: 2009-10-28 00:30:26 +0000 (Wed, 28 Oct 2009) Log Message: ----------- Add test targets for special interactive C++ examples. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-10-28 00:26:57 UTC (rev 10558) +++ trunk/examples/CMakeLists.txt 2009-10-28 00:30:26 UTC (rev 10559) @@ -617,6 +617,29 @@ endif(ENABLE_c) + if(ENABLE_cxx) + if(ENABLE_wxwidgets) + add_custom_target(test_wxPLplotDemo + COMMAND wxPLplotDemo + DEPENDS + wxPLplotDemo + wxwidgets + ) + list(APPEND interactive_targets_LIST test_wxPLplotDemo) + endif(ENABLE_wxwidgets) + + if(PLD_extqt) + add_custom_target(test_qt_example + COMMAND qt_example + DEPENDS + qt_example + qt + ) + list(APPEND interactive_targets_LIST test_qt_example) + endif(PLD_extqt) + + endif(ENABLE_cxx) + add_custom_target(test_interactive) if(interactive_targets_LIST) add_dependencies(test_interactive ${interactive_targets_LIST}) @@ -626,36 +649,6 @@ list(APPEND interactive_targets_LIST ${targets_examples_tk}) endif(targets_examples_tk) - get_property(target_plplotcanvas_demo GLOBAL PROPERTY TARGET_plplotcanvas_demo) - if(target_plplotcanvas_demo) - list(APPEND interactive_targets_LIST ${target_plplotcanvas_demo}) - endif(target_plplotcanvas_demo) - - get_property(target_plplotcanvas_animation GLOBAL PROPERTY TARGET_plplotcanvas_animation) - if(target_plplotcanvas_animation) - list(APPEND interactive_targets_LIST ${target_plplotcanvas_animation}) - endif(target_plplotcanvas_animation) - - get_property(target_extXdrawable_demo GLOBAL PROPERTY TARGET_extXdrawable_demo) - if(target_extXdrawable_demo) - list(APPEND interactive_targets_LIST ${target_extXdrawable_demo}) - endif(target_extXdrawable_demo) - - get_property(target_ext-cairo-test GLOBAL PROPERTY TARGET_ext-cairo-test) - if(target_ext-cairo-test) - list(APPEND interactive_targets_LIST ${target_ext-cairo-test}) - endif(target_ext-cairo-test) - - get_property(target_wxPLplotDemo GLOBAL PROPERTY TARGET_wxPLplotDemo) - if(target_wxPLplotDemo) - list(APPEND interactive_targets_LIST ${target_wxPLplotDemo}) - endif(target_wxPLplotDemo) - - get_property(target_qt_example GLOBAL PROPERTY TARGET_qt_example) - if(target_qt_example) - list(APPEND interactive_targets_LIST ${target_qt_example}) - endif(target_qt_example) - 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...> - 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. |
From: <ai...@us...> - 2009-11-14 19:20:32
|
Revision: 10587 http://plplot.svn.sourceforge.net/plplot/?rev=10587&view=rev Author: airwin Date: 2009-11-14 19:20:22 +0000 (Sat, 14 Nov 2009) Log Message: ----------- Implement test_all_qt and test_all_cairo custom targets which test all qt devices and special examples and all cairo devices and special examples. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-11-14 18:16:12 UTC (rev 10586) +++ trunk/examples/CMakeLists.txt 2009-11-14 19:20:22 UTC (rev 10587) @@ -682,6 +682,35 @@ 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) + add_dependencies(test_all_qt + test_c_epsqt + test_c_pdfqt + test_c_bmpqt + test_c_jpgqt + test_c_pngqt + test_c_ppmqt + test_c_tiffqt + test_c_svgqt + test_c_qtwidget + test_qt_example + ) + + # Custom target to test all of cairo devices/special examples. + # Must be maintained. + add_custom_target(test_all_cairo) + add_dependencies(test_all_cairo + test_c_pdfcairo + test_c_pngcairo + test_c_pscairo + test_c_svgcairo + test_extcairo + test_c_xcairo + test_extXdrawable + ) + 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-01-07 00:53:22
|
Revision: 10740 http://plplot.svn.sourceforge.net/plplot/?rev=10740&view=rev Author: airwin Date: 2010-01-07 00:53:13 +0000 (Thu, 07 Jan 2010) Log Message: ----------- Replace bashism with the "env" cross-shell equivalent. Under these circumstances VERBATIM works fine for embedded blanks in directory names, so use it. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2010-01-06 23:08:17 UTC (rev 10739) +++ trunk/examples/CMakeLists.txt 2010-01-07 00:53:13 UTC (rev 10740) @@ -458,8 +458,9 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/x01${suffix}.psc COMMAND ${CMAKE_COMMAND} -E echo "Generate ${language} results for psc device" - COMMAND DUMMY= ${environment} ${custom_test_command} --verbose --front-end=${language} --device=psc + 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 @@ -534,9 +535,10 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/x01c${index}.${device} COMMAND ${CMAKE_COMMAND} -E echo "Generate C results for ${device} file device" - COMMAND DUMMY= ${custom_env} ${custom_test_command} --verbose --front-end=c --device=${device} + COMMAND env ${custom_env} ${custom_test_command} --verbose --front-end=c --device=${device} DEPENDS ${file_device_depends_${device}} + VERBATIM ) add_custom_target(test_c_${device} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/x01c${index}.${device} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |