From: <and...@us...> - 2009-02-21 17:54:12
|
Revision: 9576 http://plplot.svn.sourceforge.net/plplot/?rev=9576&view=rev Author: andrewross Date: 2009-02-21 17:54:08 +0000 (Sat, 21 Feb 2009) Log Message: ----------- Examples do not need to have lib/qsastime in the include path as they only include plplot.h and not plplotP.h. Modified Paths: -------------- trunk/examples/ada/CMakeLists.txt trunk/examples/c/CMakeLists.txt trunk/examples/c++/CMakeLists.txt trunk/examples/f77/CMakeLists.txt trunk/examples/f95/CMakeLists.txt Modified: trunk/examples/ada/CMakeLists.txt =================================================================== --- trunk/examples/ada/CMakeLists.txt 2009-02-21 17:53:23 UTC (rev 9575) +++ trunk/examples/ada/CMakeLists.txt 2009-02-21 17:54:08 UTC (rev 9576) @@ -87,7 +87,6 @@ remove_definitions("-DHAVE_CONFIG_H") include_directories( ${CMAKE_BINARY_DIR}/examples/ada - ${CMAKE_SOURCE_DIR}/lib/qsastime ${CMAKE_BINARY_DIR}/bindings/ada ) endif(BUILD_TEST) Modified: trunk/examples/c/CMakeLists.txt =================================================================== --- trunk/examples/c/CMakeLists.txt 2009-02-21 17:53:23 UTC (rev 9575) +++ trunk/examples/c/CMakeLists.txt 2009-02-21 17:54:08 UTC (rev 9576) @@ -62,7 +62,6 @@ remove_definitions("-DHAVE_CONFIG_H") include_directories( ${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/lib/qsastime ${CMAKE_BINARY_DIR}/include ) endif(BUILD_TEST) Modified: trunk/examples/c++/CMakeLists.txt =================================================================== --- trunk/examples/c++/CMakeLists.txt 2009-02-21 17:53:23 UTC (rev 9575) +++ trunk/examples/c++/CMakeLists.txt 2009-02-21 17:54:08 UTC (rev 9576) @@ -63,7 +63,6 @@ include_directories( ${CMAKE_SOURCE_DIR}/bindings/c++ ${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/lib/qsastime ${CMAKE_BINARY_DIR}/include ) endif(BUILD_TEST) Modified: trunk/examples/f77/CMakeLists.txt =================================================================== --- trunk/examples/f77/CMakeLists.txt 2009-02-21 17:53:23 UTC (rev 9575) +++ trunk/examples/f77/CMakeLists.txt 2009-02-21 17:54:08 UTC (rev 9576) @@ -97,7 +97,6 @@ remove_definitions("-DHAVE_CONFIG_H") include_directories( ${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/lib/qsastime ${CMAKE_BINARY_DIR}/include ) endif(BUILD_TEST) Modified: trunk/examples/f95/CMakeLists.txt =================================================================== --- trunk/examples/f95/CMakeLists.txt 2009-02-21 17:53:23 UTC (rev 9575) +++ trunk/examples/f95/CMakeLists.txt 2009-02-21 17:54:08 UTC (rev 9576) @@ -69,7 +69,6 @@ PROPERTIES GENERATED ON) include_directories( ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/lib/qsastime ) if(BUILD_TEST) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-26 17:13:37
|
Revision: 10005 http://plplot.svn.sourceforge.net/plplot/?rev=10005&view=rev Author: airwin Date: 2009-05-26 17:13:32 +0000 (Tue, 26 May 2009) Log Message: ----------- Move from example 3 back to the traditional example 1 as the archetype now that example 1 has been implemented for D. Modified Paths: -------------- trunk/examples/CMakeLists.txt_installed_examples trunk/examples/Makefile.examples.in Modified: trunk/examples/CMakeLists.txt_installed_examples =================================================================== --- trunk/examples/CMakeLists.txt_installed_examples 2009-05-26 11:29:32 UTC (rev 10004) +++ trunk/examples/CMakeLists.txt_installed_examples 2009-05-26 17:13:32 UTC (rev 10005) @@ -118,16 +118,14 @@ string(REGEX REPLACE "^(.*):.*$" "\\1" language ${language_info}) string(REGEX REPLACE "^.*:(.*)$" "\\1" suffix ${language_info}) - # Will change from x03 to x01 as the representative result below when - # standard example 1 is implemented in d. add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/x03${suffix}.psc + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/x01${suffix}.psc COMMAND ${CMAKE_COMMAND} -E echo "Generate ${language} results for psc device" COMMAND SRC_EXAMPLES_DIR=${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh --verbose --front-end=${language} --device=psc DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh ) - list(APPEND output_LIST ${CMAKE_CURRENT_BINARY_DIR}/x03${suffix}.psc) + list(APPEND output_LIST ${CMAKE_CURRENT_BINARY_DIR}/x01${suffix}.psc) if(targets_examples_${language}) list(APPEND targets_LIST ${targets_examples_${language}}) endif(targets_examples_${language}) Modified: trunk/examples/Makefile.examples.in =================================================================== --- trunk/examples/Makefile.examples.in 2009-05-26 11:29:32 UTC (rev 10004) +++ trunk/examples/Makefile.examples.in 2009-05-26 17:13:32 UTC (rev 10005) @@ -68,19 +68,18 @@ # Just for c, c++, and tk directories @PSC_CXX_COMMENT@test_interactive: c++/x01@EXEEXT@ -# Temporary use 3rd example until first example is done. -@PSC_D_COMMENT@all: d/x03d@EXEEXT@ -@PSC_D_COMMENT@d/x03d@EXEEXT@: +@PSC_D_COMMENT@all: d/x01d@EXEEXT@ +@PSC_D_COMMENT@d/x01d@EXEEXT@: @PSC_D_COMMENT@ cd d; $(MAKE) @PSC_D_COMMENT@d_clean: @PSC_D_COMMENT@ cd d; $(MAKE) clean @PSC_D_COMMENT@.PHONY: d_clean @PSC_D_COMMENT@clean: d_clean -@PSC...@x0...c: d/x03d@EXEEXT@ +@PSC...@x0...c: d/x01d@EXEEXT@ @PSC_D_COMMENT@ @echo Generate d results for psc device @PSC_D_COMMENT@ ./plplot-test.sh --verbose --front-end=d --device=psc -@PSC_D_COMMENT@test_noninteractive: x03d.psc -@PSC_D_COMMENT@@COMPARE_COMMENT@compare: x03d.psc +@PSC_D_COMMENT@test_noninteractive: x01d.psc +@PSC_D_COMMENT@@COMPARE_COMMENT@compare: x01d.psc @PSC_F77_COMMENT@all: f77/x01f@EXEEXT@ @PSC_F77_COMMENT@f77/x01f@EXEEXT@: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-30 17:30:48
|
Revision: 10017 http://plplot.svn.sourceforge.net/plplot/?rev=10017&view=rev Author: airwin Date: 2009-05-30 17:30:29 +0000 (Sat, 30 May 2009) Log Message: ----------- Build ext-cairo-test with new CMake-based build system for installed examples. Modified Paths: -------------- trunk/examples/c/CMakeLists.txt_installed_examples_c trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/c/CMakeLists.txt_installed_examples_c =================================================================== --- trunk/examples/c/CMakeLists.txt_installed_examples_c 2009-05-30 16:39:47 UTC (rev 10016) +++ trunk/examples/c/CMakeLists.txt_installed_examples_c 2009-05-30 17:30:29 UTC (rev 10017) @@ -110,8 +110,9 @@ target_link_libraries(plplotcanvas_animation ${GNOMEPRINTUI_LINK_FLAGS} ${GTHREAD_2.0_LINK_FLAGS} plplotgnome2${LIB_TAG}) endif(ENABLE_plplotcanvas_animation) endif(ENABLE_gnome2) + if(PLD_xcairo) - pkg_check_pkgconfig(gtk+-x11-2.0 includedir libdir linkflags3 cflags3 version1 _GTK_X11) + pkg_check_pkgconfig(gtk+-x11-2.0 includedir libdir linkflags3 cflags3 version3 _GTK_X11) if(linkflags3) # Requires blank-delimited list. string(REGEX REPLACE ";" " " GTK_X11_COMPILE_FLAGS "${cflags3}") @@ -126,6 +127,23 @@ message(STATUS "WARNING: gtk+-x11-2.0 not found. extXdrawable_demo not built.") endif(linkflags3) endif(PLD_xcairo) + + if(PLD_extcairo) + pkg_check_pkgconfig(cairo includedir libdir linkflags4 cflags4 version4 _CAIRO) + if(linkflags4) + # Requires blank-delimited list. + string(REGEX REPLACE ";" " " CAIRO_COMPILE_FLAGS "${cflags4}") + set(CAIRO_LINK_FLAGS "${linkflags4}") + set_source_files_properties( + ext-cairo-test.c + PROPERTIES COMPILE_FLAGS "${CAIRO_COMPILE_FLAGS}" + ) + add_executable(ext-cairo-test ext-cairo-test.c) + target_link_libraries(ext-cairo-test ${CAIRO_LINK_FLAGS} plplot${LIB_TAG}) + else(linkflags4) + message(STATUS "WARNING: cairo not found. ext-cairo-test not built.") + endif(linkflags3) + endif(PLD_xcairo) else(PKG_CONFIG_EXECUTABLE) - message(STATUS "WARNING: pkg-config not found so plplotcanvas_demo and plplotcanvas_animation not built.") + message(STATUS "WARNING: pkg-config not found so plplotcanvas_demo, plplotcanvas_animation, extXdrawable_demo, and ext-cairo-test not built.") endif(PKG_CONFIG_EXECUTABLE) Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-30 16:39:47 UTC (rev 10016) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-30 17:30:29 UTC (rev 10017) @@ -165,4 +165,5 @@ set(PLD_xfig @PLD_xfig@) # Set interactive devices -set(PLD_xcairo @PLD_xcairo@) \ No newline at end of file +set(PLD_xcairo @PLD_xcairo@) +set(PLD_extcairo @PLD_extcairo@) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-06-28 02:47:17
|
Revision: 10082 http://plplot.svn.sourceforge.net/plplot/?rev=10082&view=rev Author: airwin Date: 2009-06-28 02:47:15 +0000 (Sun, 28 Jun 2009) Log Message: ----------- Add some useful functionality to the new build system for the installed examples. Implement options for DEFAULT_NO_BINDINGS, ENABLE_cxx, etc., for the list of all bindings, DEFAULT_NO_DEVICES, PLD_ps, etc., for the list of all devices. These options give useful control over what examples are built and run. N.B. these options can only take away from what is configured by the core build system and cannot add to it, but judicious choice of these options can save some substantial test time and disk space consumed by the tests. Add summary of all bindings and device options that control what examples are built and run. Modified Paths: -------------- trunk/examples/CMakeLists.txt_installed_examples trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/CMakeLists.txt_installed_examples =================================================================== --- trunk/examples/CMakeLists.txt_installed_examples 2009-06-28 01:01:56 UTC (rev 10081) +++ trunk/examples/CMakeLists.txt_installed_examples 2009-06-28 02:47:15 UTC (rev 10082) @@ -1,3 +1,4 @@ +# -*- mode: cmake -*- # Top-level CMakeLists.txt for installed PLplot examples ### ### Process this file with cmake to produce Makefile @@ -29,58 +30,48 @@ include(plplot_configure) include(export_plplot) -add_subdirectory(c) -get_property(targets_examples_c GLOBAL PROPERTY TARGETS_examples_c) -set(language_info_LIST c:c) +if(ENABLE_c) + add_subdirectory(c) + get_property(targets_examples_c GLOBAL PROPERTY TARGETS_examples_c) +endif(ENABLE_c) + if(ENABLE_ada) add_subdirectory(ada) get_property(targets_examples_ada GLOBAL PROPERTY TARGETS_examples_ada) - list(APPEND language_info_LIST ada:a) endif(ENABLE_ada) if(ENABLE_cxx) add_subdirectory(c++) get_property(targets_examples_cxx GLOBAL PROPERTY TARGETS_examples_cxx) - list(APPEND language_info_LIST cxx:cxx) endif(ENABLE_cxx) if(ENABLE_d) add_subdirectory(d) get_property(targets_examples_d GLOBAL PROPERTY TARGETS_examples_d) - list(APPEND language_info_LIST d:d) endif(ENABLE_d) if(ENABLE_f77) add_subdirectory(f77) get_property(targets_examples_f77 GLOBAL PROPERTY TARGETS_examples_f77) - list(APPEND language_info_LIST f77:f) endif(ENABLE_f77) if(ENABLE_f95) add_subdirectory(f95) get_property(targets_examples_f95 GLOBAL PROPERTY TARGETS_examples_f95) - list(APPEND language_info_LIST f95:f95) endif(ENABLE_f95) if(ENABLE_java) add_subdirectory(java) get_property(targets_examples_java GLOBAL PROPERTY TARGETS_examples_java) - list(APPEND language_info_LIST java:j) endif(ENABLE_java) -if(ENABLE_lua) - list(APPEND language_info_LIST lua:lua) -endif(ENABLE_lua) - if(ENABLE_ocaml) add_subdirectory(ocaml) get_property(targets_examples_ocaml GLOBAL PROPERTY TARGETS_examples_ocaml) - list(APPEND language_info_LIST ocaml:ocaml) endif(ENABLE_ocaml) if(ENABLE_octave) - list(APPEND language_info_LIST octave:o) add_subdirectory(octave) execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different @@ -94,68 +85,87 @@ ) endif(ENABLE_octave) -if(ENABLE_pdl) - list(APPEND language_info_LIST perl:pdl) -endif(ENABLE_pdl) - -if(ENABLE_python) - list(APPEND language_info_LIST python:p) -endif(ENABLE_python) - -if(ENABLE_tcl) - list(APPEND language_info_LIST tcl:t) -endif(ENABLE_tcl) - execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/lena.pgm ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm ) -set(output_LIST) -set(noninteractive_targets_LIST) -foreach(language_info ${language_info_LIST}) - string(REGEX REPLACE "^(.*):.*$" "\\1" language ${language_info}) - string(REGEX REPLACE "^.*:(.*)$" "\\1" suffix ${language_info}) +if(PLD_psc) + set(output_LIST) + set(noninteractive_targets_LIST) + # language_info_LIST set in plplot_configure.cmake. Each list + # member consists of a colon-separated language name and the associated + # filename suffix used by plplot-test.sh. + foreach(language_info ${language_info_LIST}) + string(REGEX REPLACE "^(.*):.*$" "\\1" language ${language_info}) + string(REGEX REPLACE "^.*:(.*)$" "\\1" suffix ${language_info}) + if(ENABLE_${language}) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/x01${suffix}.psc + COMMAND ${CMAKE_COMMAND} -E echo "Generate ${language} results for psc device" + COMMAND SRC_EXAMPLES_DIR=${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh --verbose --front-end=${language} --device=psc + DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh + ) + list(APPEND output_LIST ${CMAKE_CURRENT_BINARY_DIR}/x01${suffix}.psc) + if(targets_examples_${language}) + list(APPEND noninteractive_targets_LIST ${targets_examples_${language}}) + endif(targets_examples_${language}) + endif(ENABLE_${language}) + endforeach(language_info ${language_info_LIST}) + add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/x01${suffix}.psc - COMMAND ${CMAKE_COMMAND} -E echo "Generate ${language} results for psc device" - COMMAND SRC_EXAMPLES_DIR=${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh --verbose --front-end=${language} --device=psc - DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/compare + COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/compare + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/test_diff.sh + DEPENDS ${output_LIST} ) - list(APPEND output_LIST ${CMAKE_CURRENT_BINARY_DIR}/x01${suffix}.psc) - if(targets_examples_${language}) - list(APPEND noninteractive_targets_LIST ${targets_examples_${language}}) - endif(targets_examples_${language}) -endforeach(language_info ${language_info_LIST}) + set(output_LIST ${CMAKE_CURRENT_BINARY_DIR}/compare) +else(PLD_psc) + set(output_LIST) +endif(PLD_psc) -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/compare - COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/compare - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/test_diff.sh - DEPENDS ${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}) -set(output_LIST) -foreach(device ${noninteractive_devices_LIST}) - if(PLD_${device}) + # 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) + #message("DEBUG: OUTPUT filename = x01c${index}.${device}") add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/x01c.${device} + 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} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh - ) - list(APPEND output_LIST ${CMAKE_CURRENT_BINARY_DIR}/x01c.${device}) - endif(PLD_${device}) -endforeach(device ${noninteractive_devices_LIST}) + ) + 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_noninteractive - DEPENDS ${output_LIST} ${CMAKE_CURRENT_BINARY_DIR}/compare + DEPENDS ${output_LIST} ) -add_dependencies(test_noninteractive ${noninteractive_targets_LIST}) +if(noninteractive_targets_LIST) + add_dependencies(test_noninteractive ${noninteractive_targets_LIST}) +endif(noninteractive_targets_LIST) if(ENABLE_tk) add_subdirectory(tk) @@ -196,4 +206,89 @@ COMMAND SRC_EXAMPLES_DIR=${CMAKE_CURRENT_SOURCE_DIR} EXAMPLES_DIR=${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test-interactive.sh ) -add_dependencies(test_interactive ${interactive_targets_LIST}) +if(interactive_targets_LIST) + add_dependencies(test_interactive ${interactive_targets_LIST}) +endif(interactive_targets_LIST) + +set(summary_results " +Summary of CMake build system results for the installed examples + +Noninteractive bindings: + +ENABLE_ada: ${ENABLE_ada} +ENABLE_c: ${ENABLE_c} +ENABLE_cxx: ${ENABLE_cxx} +ENABLE_d: ${ENABLE_d} +ENABLE_f77: ${ENABLE_f77} +ENABLE_f95: ${ENABLE_f95} +ENABLE_java: ${ENABLE_java} +ENABLE_lua: ${ENABLE_lua} +ENABLE_ocaml: ${ENABLE_ocaml} +ENABLE_octave: ${ENABLE_octave} +ENABLE_pdl: ${ENABLE_pdl} +ENABLE_python: ${ENABLE_python} +ENABLE_tcl: ${ENABLE_tcl} + +Interactive bindings: + +ENABLE_tk: ${ENABLE_tk} +ENABLE_gnome2: ${ENABLE_gnome2} +ENABLE_wxwidgets: ${ENABLE_wxwidgets} +ENABLE_qt: ${ENABLE_qt} + + +Noninteractive device drivers that control noninteractive tests: + +PLD_pdfcairo: ${PLD_pdfcairo} +PLD_pngcairo: ${PLD_pngcairo} +PLD_pscairo: ${PLD_pscairo} +PLD_svgcairo: ${PLD_svgcairo} +PLD_cgm: ${PLD_cgm} +PLD_dg300: ${PLD_dg300} +PLD_epsqt: ${PLD_epsqt} +PLD_pdfqt: ${PLD_pdfqt} +PLD_bmpqt: ${PLD_bmpqt} +PLD_jpgqt: ${PLD_jpgqt} +PLD_pngqt: ${PLD_pngqt} +PLD_ppmqt: ${PLD_ppmqt} +PLD_tiffqt: ${PLD_tiffqt} +PLD_svgqt: ${PLD_svgqt} +PLD_gif: ${PLD_gif} +PLD_jpeg: ${PLD_jpeg} +PLD_png: ${PLD_png} +PLD_hp7470: ${PLD_hp7470} +PLD_hp7580: ${PLD_hp7580} +PLD_lj_hpgl: ${PLD_lj_hpgl} +PLD_imp: ${PLD_imp} +PLD_ljii: ${PLD_ljii} +PLD_ljiip: ${PLD_ljiip} +PLD_pbm: ${PLD_pbm} +PLD_pdf: ${PLD_pdf} +PLD_ps: ${PLD_ps} +PLD_psc: ${PLD_psc} +PLD_pstex: ${PLD_pstex} +PLD_psttf: ${PLD_psttf} +PLD_psttfc: ${PLD_psttfc} +PLD_svg: ${PLD_svg} +PLD_tek4010f: ${PLD_tek4010f} +PLD_tek4107f: ${PLD_tek4107f} +PLD_wxpng: ${PLD_wxpng} +PLD_xfig: ${PLD_xfig} + +Interactive device drivers that control certain special example builds: + +PLD_xcairo: ${PLD_xcairo} +PLD_extcairo: ${PLD_extcairo} + +N.B. Additional interactive device drivers are likely supplied by the +PLplot core and configured as part of plplot-test-interactive.sh that +is run as the result of running + +make test_interactive + + +but the build system for the installed examples has no control over +those device drivers so we don't bother outputting them in this summary. +") + +message("${summary_results}") Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-06-28 01:01:56 UTC (rev 10081) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-06-28 02:47:15 UTC (rev 10082) @@ -14,27 +14,87 @@ set(INCLUDE_DIR @INCLUDE_DIR@) set(MATH_LIB @MATH_LIB@) -# What computer languages do we have configured? -set(ENABLE_ada @ENABLE_ada@) -set(ENABLE_cxx @ENABLE_cxx@) -set(ENABLE_d @ENABLE_d@) -set(ENABLE_f77 @ENABLE_f77@) -set(ENABLE_f95 @ENABLE_f95@) -set(ENABLE_java @ENABLE_java@) -set(ENABLE_lua @ENABLE_lua@) -set(ENABLE_ocaml @ENABLE_ocaml@) -set(ENABLE_octave @ENABLE_octave@) -set(ENABLE_pdl @ENABLE_pdl@) -set(ENABLE_python @ENABLE_python@) -set(ENABLE_tcl @ENABLE_tcl@) -set(ENABLE_tk @ENABLE_tk@) -set(ENABLE_gnome2 @ENABLE_gnome2@) -set(ENABLE_wxwidgets @ENABLE_wxwidgets@) -set(ENABLE_qt @ENABLE_qt@) +# language_info_LIST contains information about the languages used +# in the noninteractive tests. +# First field is language (which must be consistent with following +# configured set commands). +# Second field is suffix on plplot-test.sh results for that language. -# Always enable C language. -enable_language(C) +set(language_info_LIST + ada:a + c:c + cxx:cxx + d:d + f77:f + f95:f95 + java:j + lua:lua + ocaml:ocaml + octave:o + pdl:pdl + python:p + tcl:t + ) + +# This list of set commands must be consistent with the above list which +# potentially is a maintenance issue. However, cannot make this list +# automatically with a foreach loop because explicit configuration of +# each name is required. +# N.B. c handled separately below so it is excluded from this list of +# set commands. (Also, the core never sets ENABLE_c since C is always +# on for the core.) +set(CORE_ENABLE_ada @ENABLE_ada@) +set(CORE_ENABLE_cxx @ENABLE_cxx@) +set(CORE_ENABLE_d @ENABLE_d@) +set(CORE_ENABLE_f77 @ENABLE_f77@) +set(CORE_ENABLE_f95 @ENABLE_f95@) +set(CORE_ENABLE_java @ENABLE_java@) +set(CORE_ENABLE_lua @ENABLE_lua@) +set(CORE_ENABLE_ocaml @ENABLE_ocaml@) +set(CORE_ENABLE_octave @ENABLE_octave@) +set(CORE_ENABLE_pdl @ENABLE_pdl@) +set(CORE_ENABLE_python @ENABLE_python@) +set(CORE_ENABLE_tcl @ENABLE_tcl@) +# Interactive bindings +set(CORE_ENABLE_tk @ENABLE_tk@) +set(CORE_ENABLE_gnome2 @ENABLE_gnome2@) +set(CORE_ENABLE_wxwidgets @ENABLE_wxwidgets@) +set(CORE_ENABLE_qt @ENABLE_qt@) + +# What computer languages do we have configured by the core build system? +option(DEFAULT_NO_BINDINGS + "All language bindings are disabled by default" + OFF + ) + +if(DEFAULT_NO_BINDINGS) + set(PRESET_DEFAULT ON) + set(DEFAULT OFF) +else(DEFAULT_NO_BINDINGS) + set(PRESET_DEFAULT OFF) +endif(DEFAULT_NO_BINDINGS) + +# Add interactive bindings to list for option processing +foreach(language_info tk:? gnome2:? wxwidgets:? qt:? ${language_info_LIST}) + string(REGEX REPLACE "^(.*):.*$" "\\1" language ${language_info}) + #message("DEBUG: language = ${language}") + if(language STREQUAL "c") + # Special case where C is always on by definition since PLplot core + # library is written in C. + set(ENABLE_c ON) + else(language STREQUAL "c") + if(NOT PRESET_DEFAULT) + set(DEFAULT ${CORE_ENABLE_${language}}) + endif(NOT PRESET_DEFAULT) + option(ENABLE_${language} "Enable ${language} device" ${DEFAULT}) + endif(language STREQUAL "c") +endforeach(language_info ${language_info_LIST}) + +if(ENABLE_c) + enable_language(C) +endif(ENABLE_c) + if(ENABLE_ada) enable_language(Ada) set(ADA_INCLUDE_DIR @ADA_INCLUDE_DIR@) @@ -92,93 +152,131 @@ set(wxwidgets_LINK_FLAGS @wxwidgets_LINK_FLAGS@) endif(ENABLE_wxwidgets) -# Set interactive/external devices that are needed to build certain examples. -set(PLD_xcairo @PLD_xcairo@) -set(PLD_extcairo @PLD_extcairo@) - if(ENABLE_qt) set(CORE_QT_VERSION_MAJOR @QT_VERSION_MAJOR@) set(CORE_QT_VERSION_MINOR @QT_VERSION_MINOR@) set(CORE_QT_VERSION_PATCH @QT_VERSION_PATCH@) endif(ENABLE_qt) -# List of all devices that will be used for non_interactive tests. -# Exclude psc since that already has been used for comparisons above. -# Exclude some other devices (linuxvga, conex?) in plplot-test.sh where it is -# unlikely they are interactive. -set(noninteractive_devices_LIST - pdfcairo - pngcairo - pscairo - svgcairo - cgm - dg300 - epsqt - pdfqt - bmpqt - jpgqt - pngqt - ppmqt - tiffqt - svgqt - gif - jpeg - png +# List of all devices that will be used for noninteractive device tests. +# Exclude some devices (linuxvga, conex?) in plplot-test.sh +# where it is likely they are interactive. +# The first field is the device, the second field is whether it produces +# familied output (to help keep track of file dependencies). That field must +# be consistent with the shell logic which deploys the -fam option for +# certain devices in plplot-test.sh.cmake. +# N.B. That field has nothing to do with whether the device is turned ON +# or not. +set(noninteractive_devices_info_LIST + pdfcairo:OFF + pngcairo:ON + pscairo:OFF + svgcairo:ON + cgm:OFF + dg300:OFF + epsqt:ON + pdfqt:ON + bmpqt:ON + jpgqt:ON + pngqt:ON + ppmqt:ON + tiffqt:ON + svgqt:ON + gif:ON + jpeg:ON + png:ON # All hp7xxx devices are semi-broken (Invalid pen selection warnings) -# hp7470 -# hp7580 +# hp7470:OFF +# hp7580:OFF # lj_hpgl is severely broken (segfaults). -# lj_hpgl - imp - ljii - ljiip +# lj_hpgl:OFF + imp:OFF + ljii:OFF + ljiip:OFF # pbm is severely broken (glibc double free detected) -# pbm - pdf - ps - pstex - psttf - psttfc - svg - tek4010f - tek4107f - wxpng - xfig +# pbm:OFF + pdf:OFF +# Include ps in list because we want to test monochromatic results, but +# exclude psc because that already done with noninteractive language tests. + ps:OFF +# psc:OFF + pstex:OFF + psttf:OFF + psttfc:OFF + svg:ON + tek4010f:OFF + tek4107f:OFF + wxpng:OFF + xfig:ON ) -# These are taken from the above list. -set(PLD_pdfcairo @PLD_pdfcairo@) -set(PLD_pngcairo @PLD_pngcairo@) -set(PLD_pscairo @PLD_pscairo@) -set(PLD_svgcairo @PLD_svgcairo@) -set(PLD_cgm @PLD_cgm@) -set(PLD_dg300 @PLD_dg300@) -set(PLD_epsqt @PLD_epsqt@) -set(PLD_pdfqt @PLD_pdfqt@) -set(PLD_bmpqt @PLD_bmpqt@) -set(PLD_jpgqt @PLD_jpgqt@) -set(PLD_pngqt @PLD_pngqt@) -set(PLD_ppmqt @PLD_ppmqt@) -set(PLD_tiffqt @PLD_tiffqt@) -set(PLD_svgqt @PLD_svgqt@) -set(PLD_gif @PLD_gif@) -set(PLD_jpeg @PLD_jpeg@) -set(PLD_png @PLD_png@) -set(PLD_hp7470 @PLD_hp7470@) -set(PLD_hp7580 @PLD_hp7580@) -set(PLD_lj_hpgl @PLD_lj_hpgl@) -set(PLD_imp @PLD_imp@) -set(PLD_ljii @PLD_ljii@) -set(PLD_ljiip @PLD_ljiip@) -set(PLD_pbm @PLD_pbm@) -set(PLD_pdf @PLD_pdf@) -set(PLD_ps @PLD_ps@) -set(PLD_pstex @PLD_pstex@) -set(PLD_psttf @PLD_psttf@) -# PLD_psttfc is a special case which must be set to PLD_psttf. -set(PLD_psttfc @PLD_psttf@) -set(PLD_svg @PLD_svg@) -set(PLD_tek4010f @PLD_tek4010f@) -set(PLD_tek4107f @PLD_tek4107f@) -set(PLD_wxpng @PLD_wxpng@) -set(PLD_xfig @PLD_xfig@) +# This list of set commands must be consistent with the above list which +# potentially is a maintenance issue. However, cannot make this list +# automatically with a foreach loop because explicit configuration of +# each name is required. +set(CORE_PLD_pdfcairo @PLD_pdfcairo@) +set(CORE_PLD_pngcairo @PLD_pngcairo@) +set(CORE_PLD_pscairo @PLD_pscairo@) +set(CORE_PLD_svgcairo @PLD_svgcairo@) +set(CORE_PLD_cgm @PLD_cgm@) +set(CORE_PLD_dg300 @PLD_dg300@) +set(CORE_PLD_epsqt @PLD_epsqt@) +set(CORE_PLD_pdfqt @PLD_pdfqt@) +set(CORE_PLD_bmpqt @PLD_bmpqt@) +set(CORE_PLD_jpgqt @PLD_jpgqt@) +set(CORE_PLD_pngqt @PLD_pngqt@) +set(CORE_PLD_ppmqt @PLD_ppmqt@) +set(CORE_PLD_tiffqt @PLD_tiffqt@) +set(CORE_PLD_svgqt @PLD_svgqt@) +set(CORE_PLD_gif @PLD_gif@) +set(CORE_PLD_jpeg @PLD_jpeg@) +set(CORE_PLD_png @PLD_png@) +set(CORE_PLD_hp7470 @PLD_hp7470@) +set(CORE_PLD_hp7580 @PLD_hp7580@) +set(CORE_PLD_lj_hpgl @PLD_lj_hpgl@) +set(CORE_PLD_imp @PLD_imp@) +set(CORE_PLD_ljii @PLD_ljii@) +set(CORE_PLD_ljiip @PLD_ljiip@) +set(CORE_PLD_pbm @PLD_pbm@) +set(CORE_PLD_pdf @PLD_pdf@) +set(CORE_PLD_ps @PLD_ps@) +set(CORE_PLD_pstex @PLD_pstex@) +set(CORE_PLD_psttf @PLD_psttf@) +set(CORE_PLD_svg @PLD_svg@) +set(CORE_PLD_tek4010f @PLD_tek4010f@) +set(CORE_PLD_tek4107f @PLD_tek4107f@) +set(CORE_PLD_wxpng @PLD_wxpng@) +set(CORE_PLD_xfig @PLD_xfig@) + +# Special case where core configures both ps and psc with PLD_ps. +set(CORE_PLD_psc @PLD_ps@) +# Special case where core configures both psttf and psttfc with PLD_psttf. +set(CORE_PLD_psttfc @PLD_psttf@) + +# Set interactive/external devices that are needed to build certain examples. +set(CORE_PLD_xcairo @PLD_xcairo@) +set(CORE_PLD_extcairo @PLD_extcairo@) + +option(DEFAULT_NO_DEVICES + "Disable all (ON) or enable individually (OFF) devices by default" + OFF + ) + +if(DEFAULT_NO_DEVICES) + set(PRESET_DEFAULT ON) + set(DEFAULT OFF) +else(DEFAULT_NO_DEVICES) + set(PRESET_DEFAULT OFF) +endif(DEFAULT_NO_DEVICES) + +# Generate psc, xcairo, and extcairo options in addition to everything on +# noninteractive_devices_info_LIST + +foreach(noninteractive_devices_info psc:? xcairo:? extcairo:? ${noninteractive_devices_info_LIST}) + string(REGEX REPLACE "^(.*):.*$" "\\1" DEVICE ${noninteractive_devices_info}) + #message("DEBUG: DEVICE = ${DEVICE}") + if(NOT PRESET_DEFAULT) + set(DEFAULT ${CORE_PLD_${DEVICE}}) + endif(NOT PRESET_DEFAULT) + option(PLD_${DEVICE} "Enable ${DEVICE} device" ${DEFAULT}) +endforeach(noninteractive_devices_info psc:OFF xcairo:OFF extcairo:OFF ${noninteractive_devices_info_LIST}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-12-02 06:41:04
|
Revision: 10664 http://plplot.svn.sourceforge.net/plplot/?rev=10664&view=rev Author: airwin Date: 2009-12-02 06:40:52 +0000 (Wed, 02 Dec 2009) Log Message: ----------- Minor code cleanup. Modified Paths: -------------- trunk/examples/c/x30c.c trunk/examples/c++/x30.cc trunk/examples/f77/x30f.fm4 Modified: trunk/examples/c/x30c.c =================================================================== --- trunk/examples/c/x30c.c 2009-12-02 03:36:24 UTC (rev 10663) +++ trunk/examples/c/x30c.c 2009-12-02 06:40:52 UTC (rev 10664) @@ -47,7 +47,6 @@ int i, j; PLINT icol, r, g, b; PLFLT a; - PLFLT clevel[101]; plparseopts( &argc, argv, PL_PARSE_FULL ); Modified: trunk/examples/c++/x30.cc =================================================================== --- trunk/examples/c++/x30.cc 2009-12-02 03:36:24 UTC (rev 10663) +++ trunk/examples/c++/x30.cc 2009-12-02 06:40:52 UTC (rev 10664) @@ -74,7 +74,6 @@ int i, j; PLINT icol, r, g, b; PLFLT a; - PLFLT clevel[101]; pls = new plstream; Modified: trunk/examples/f77/x30f.fm4 =================================================================== --- trunk/examples/f77/x30f.fm4 2009-12-02 03:36:24 UTC (rev 10663) +++ trunk/examples/f77/x30f.fm4 2009-12-02 06:40:52 UTC (rev 10664) @@ -46,7 +46,7 @@ integer i, j integer icol, r, g, b - real*8 a, clevel(101) + real*8 a character*1 defined This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-03-04 02:13:43
|
Revision: 10843 http://plplot.svn.sourceforge.net/plplot/?rev=10843&view=rev Author: airwin Date: 2010-03-04 02:13:37 +0000 (Thu, 04 Mar 2010) Log Message: ----------- Found and fixed source of bug 2963021 which was a missing "$w cmd" on the last call to plslabelfunc. Because of this change example 19 can now be tested with all the rest of the standard examples in examples/tk/standard_examples.in. Modified Paths: -------------- trunk/examples/tcl/x19.tcl trunk/examples/tk/standard_examples.in Modified: trunk/examples/tcl/x19.tcl =================================================================== --- trunk/examples/tcl/x19.tcl 2010-03-04 01:08:00 UTC (rev 10842) +++ trunk/examples/tcl/x19.tcl 2010-03-04 02:13:37 UTC (rev 10843) @@ -121,7 +121,7 @@ $w cmd plmap usaglobe $minx $maxx $miny $maxy # Clear the labeling function - plslabelfunc "" + $w cmd plslabelfunc "" # Polar, Northern hemisphere # Note: the first argument now is the name of the procedure Modified: trunk/examples/tk/standard_examples.in =================================================================== --- trunk/examples/tk/standard_examples.in 2010-03-04 01:08:00 UTC (rev 10842) +++ trunk/examples/tk/standard_examples.in 2010-03-04 02:13:37 UTC (rev 10843) @@ -2,7 +2,6 @@ # Run plserver example for standard examples. # Drop examples 14 and 31 because querying for devices does not # seem to work in this context. -# Drop example 19 because of "invalid command name "plslabelfunc" @plserver_LOCATION@ <<EOF source tkdemos.tcl 1 @@ -22,6 +21,7 @@ 16 17 18 +19 20 21 22 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2011-01-11 00:44:21
|
Revision: 11472 http://plplot.svn.sourceforge.net/plplot/?rev=11472&view=rev Author: airwin Date: 2011-01-11 00:44:15 +0000 (Tue, 11 Jan 2011) Log Message: ----------- Property tweaks. Thanks to David MacMahon for spotting these issues. Modified Paths: -------------- trunk/examples/ada/x06a.adb trunk/examples/ada/x07a.adb trunk/examples/ada/xthick06a.adb trunk/examples/ada/xthick07a.adb trunk/examples/python/xw20.py trunk/examples/python/xw21.py trunk/examples/python/xw25.py Property Changed: ---------------- trunk/examples/ada/x06a.adb trunk/examples/ada/x07a.adb trunk/examples/ada/xthick06a.adb trunk/examples/ada/xthick07a.adb trunk/examples/python/xw20.py trunk/examples/python/xw21.py trunk/examples/python/xw25.py Modified: trunk/examples/ada/x06a.adb =================================================================== --- trunk/examples/ada/x06a.adb 2011-01-11 00:37:24 UTC (rev 11471) +++ trunk/examples/ada/x06a.adb 2011-01-11 00:44:15 UTC (rev 11472) @@ -1,4 +1,4 @@ --- $Id: x01a.adb.cmake 8022 2007-11-13 18:58:30Z airwin $ +-- $Id$ -- Displays the entire "plpoin" symbol (font) set. Property changes on: trunk/examples/ada/x06a.adb ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Modified: trunk/examples/ada/x07a.adb =================================================================== --- trunk/examples/ada/x07a.adb 2011-01-11 00:37:24 UTC (rev 11471) +++ trunk/examples/ada/x07a.adb 2011-01-11 00:44:15 UTC (rev 11472) @@ -1,4 +1,4 @@ --- $Id: x01a.adb.cmake 8022 2007-11-13 18:58:30Z airwin $ +-- $Id$ -- Font demo. Property changes on: trunk/examples/ada/x07a.adb ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Modified: trunk/examples/ada/xthick06a.adb =================================================================== --- trunk/examples/ada/xthick06a.adb 2011-01-11 00:37:24 UTC (rev 11471) +++ trunk/examples/ada/xthick06a.adb 2011-01-11 00:44:15 UTC (rev 11472) @@ -1,4 +1,4 @@ --- $Id: x01a.adb.cmake 8022 2007-11-13 18:58:30Z airwin $ +-- $Id$ -- Displays the entire "Draw_Points" symbol (font) set. Property changes on: trunk/examples/ada/xthick06a.adb ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Modified: trunk/examples/ada/xthick07a.adb =================================================================== --- trunk/examples/ada/xthick07a.adb 2011-01-11 00:37:24 UTC (rev 11471) +++ trunk/examples/ada/xthick07a.adb 2011-01-11 00:44:15 UTC (rev 11472) @@ -1,4 +1,4 @@ --- $Id: x01a.adb.cmake 8022 2007-11-13 18:58:30Z airwin $ +-- $Id$ -- Font demo. Property changes on: trunk/examples/ada/xthick07a.adb ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Modified: trunk/examples/python/xw20.py =================================================================== --- trunk/examples/python/xw20.py 2011-01-11 00:37:24 UTC (rev 11471) +++ trunk/examples/python/xw20.py 2011-01-11 00:44:15 UTC (rev 11472) @@ -1,4 +1,4 @@ -# $Id: xw30.py 8224 2008-02-07 16:18:26Z andrewross $ +# $Id$ # Copyright (C) 2007, 2008 Andrew Ross Property changes on: trunk/examples/python/xw20.py ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/examples/python/xw21.py =================================================================== --- trunk/examples/python/xw21.py 2011-01-11 00:37:24 UTC (rev 11471) +++ trunk/examples/python/xw21.py 2011-01-11 00:44:15 UTC (rev 11472) @@ -1,4 +1,4 @@ -# $Id: xw30.py 8224 2008-02-07 16:18:26Z andrewross $ +# $Id$ # Copyright (C) 2007, 2008 Andrew Ross Property changes on: trunk/examples/python/xw21.py ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/examples/python/xw25.py =================================================================== --- trunk/examples/python/xw25.py 2011-01-11 00:37:24 UTC (rev 11471) +++ trunk/examples/python/xw25.py 2011-01-11 00:44:15 UTC (rev 11472) @@ -1,4 +1,4 @@ -# $Id: xw30.py 8224 2008-02-07 16:18:26Z andrewross $ +# $Id$ # Copyright (C) 2007, 2008 Andrew Ross Property changes on: trunk/examples/python/xw25.py ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-05-18 22:06:01
|
Revision: 13124 http://sourceforge.net/p/plplot/code/13124 Author: airwin Date: 2014-05-18 22:05:54 +0000 (Sun, 18 May 2014) Log Message: ----------- Use specific (bash) shell for the traditional (Makefile + pkg-config) build system Makefiles for the installed examples. This solves potential bugs where bashisms in these Makefiles would lead to errors for systems where the default shell used by by the make command is not bash. Modified Paths: -------------- trunk/examples/Makefile.examples.in trunk/examples/ada/Makefile.examples.in trunk/examples/c/Makefile.examples.in trunk/examples/c++/Makefile.examples.in trunk/examples/d/Makefile.examples.in trunk/examples/f95/Makefile.examples.in trunk/examples/java/Makefile.examples.in trunk/examples/ocaml/Makefile.examples.in trunk/examples/tk/Makefile.examples.in Modified: trunk/examples/Makefile.examples.in =================================================================== --- trunk/examples/Makefile.examples.in 2014-05-18 21:59:51 UTC (rev 13123) +++ trunk/examples/Makefile.examples.in 2014-05-18 22:05:54 UTC (rev 13124) @@ -25,6 +25,7 @@ # It combines building all the examples that need to be built along # with testing all examples. +SHELL = @SH_EXECUTABLE@ all: c/x01c@EXEEXT@ c/x01c@EXEEXT@: cd c; $(MAKE) Modified: trunk/examples/ada/Makefile.examples.in =================================================================== --- trunk/examples/ada/Makefile.examples.in 2014-05-18 21:59:51 UTC (rev 13123) +++ trunk/examples/ada/Makefile.examples.in 2014-05-18 22:05:54 UTC (rev 13124) @@ -21,6 +21,7 @@ # along with the file PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +SHELL = @SH_EXECUTABLE@ GNAT_EXECUTABLE_BUILDER = @GNAT_EXECUTABLE_BUILDER@ \ -aI@ADA_INCLUDE_DIR@ -aL@ADA_LIB_DIR@ EXEEXT = @EXEEXT@ Modified: trunk/examples/c/Makefile.examples.in =================================================================== --- trunk/examples/c/Makefile.examples.in 2014-05-18 21:59:51 UTC (rev 13123) +++ trunk/examples/c/Makefile.examples.in 2014-05-18 22:05:54 UTC (rev 13124) @@ -21,6 +21,7 @@ # along with the file PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +SHELL = @SH_EXECUTABLE@ CC = @CC@ EXEEXT = @EXEEXT@ Modified: trunk/examples/c++/Makefile.examples.in =================================================================== --- trunk/examples/c++/Makefile.examples.in 2014-05-18 21:59:51 UTC (rev 13123) +++ trunk/examples/c++/Makefile.examples.in 2014-05-18 22:05:54 UTC (rev 13124) @@ -21,6 +21,7 @@ # along with the file PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +SHELL = @SH_EXECUTABLE@ CXX = @CXX@ EXEEXT = @EXEEXT@ Modified: trunk/examples/d/Makefile.examples.in =================================================================== --- trunk/examples/d/Makefile.examples.in 2014-05-18 21:59:51 UTC (rev 13123) +++ trunk/examples/d/Makefile.examples.in 2014-05-18 22:05:54 UTC (rev 13124) @@ -19,6 +19,7 @@ # along with the file PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +SHELL = @SH_EXECUTABLE@ DC = @DC@ EXEEXT = @EXEEXT@ Modified: trunk/examples/f95/Makefile.examples.in =================================================================== --- trunk/examples/f95/Makefile.examples.in 2014-05-18 21:59:51 UTC (rev 13123) +++ trunk/examples/f95/Makefile.examples.in 2014-05-18 22:05:54 UTC (rev 13124) @@ -21,6 +21,7 @@ # along with the file PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +SHELL = @SH_EXECUTABLE@ F95 = @FC@ EXEEXT = @EXEEXT@ Modified: trunk/examples/java/Makefile.examples.in =================================================================== --- trunk/examples/java/Makefile.examples.in 2014-05-18 21:59:51 UTC (rev 13123) +++ trunk/examples/java/Makefile.examples.in 2014-05-18 22:05:54 UTC (rev 13124) @@ -19,6 +19,7 @@ # along with the file PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +SHELL = @SH_EXECUTABLE@ JAVAC = @JAVAC@ PLPLOT_CLASSPATH = @JAVADATA_HARDDIR@/plplot.jar Modified: trunk/examples/ocaml/Makefile.examples.in =================================================================== --- trunk/examples/ocaml/Makefile.examples.in 2014-05-18 21:59:51 UTC (rev 13123) +++ trunk/examples/ocaml/Makefile.examples.in 2014-05-18 22:05:54 UTC (rev 13124) @@ -21,6 +21,7 @@ # along with the file PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +SHELL = @SH_EXECUTABLE@ OCAMLC = @OCAML_EXAMPLE_COMPILER@ EXEEXT = @EXEEXT@ Modified: trunk/examples/tk/Makefile.examples.in =================================================================== --- trunk/examples/tk/Makefile.examples.in 2014-05-18 21:59:51 UTC (rev 13123) +++ trunk/examples/tk/Makefile.examples.in 2014-05-18 22:05:54 UTC (rev 13124) @@ -20,6 +20,7 @@ # along with the file PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +SHELL = @SH_EXECUTABLE@ CC = @CC@ EXEEXT = @EXEEXT@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2009-02-23 22:43:12
|
Revision: 9593 http://plplot.svn.sourceforge.net/plplot/?rev=9593&view=rev Author: andrewross Date: 2009-02-23 21:55:49 +0000 (Mon, 23 Feb 2009) Log Message: ----------- Fix formatting for java version of example 31. Modify f77 / f95 versions of example 31 consistent with the C version. Modified Paths: -------------- trunk/examples/f77/x31f.fm4 trunk/examples/f95/x31f.f90 trunk/examples/java/x31.java Modified: trunk/examples/f77/x31f.fm4 =================================================================== --- trunk/examples/f77/x31f.fm4 2009-02-23 21:13:04 UTC (rev 9592) +++ trunk/examples/f77/x31f.fm4 2009-02-23 21:55:49 UTC (rev 9593) @@ -31,9 +31,11 @@ real*8 xmid, ymid, wx, wy real*8 mar, aspect, jx, jy, ori integer win, level2, digmax, digits, compression1, compression2 - real*8 xp1, yp1, xp2, yp2 - integer xleng1, yleng1, xoff1, yoff1, xleng2, yleng2, xoff2, yoff2 - integer fam1, num1, bmax1, fam2, num2, bmax2, r, g, b + real*8 xp0, yp0, xp1, yp1, xp2, yp2 + integer xleng0, yleng0, xoff0, yoff0, xleng1, yleng1, xoff1, yoff1 + integer xleng2, yleng2, xoff2, yoff2 + integer fam0, num0, bmax0, fam1, num1, bmax1, fam2, num2, bmax2 + integer r, g, b real*8 a integer r1(2), g1(2), b1(2) data r1 /0, 255/ @@ -56,6 +58,51 @@ stderr = 0 call plparseopts(PL_PARSE_FULL) + +c Test setting / getting familying parameters before plinit +c Save values set by plparseopts to be restored later. + call plgfam(fam0, num0, bmax0) + fam1 = 0 + num1 = 10 + bmax1 = 1000 + call plsfam(fam1, num1, bmax1) + +c Retrieve the same values? + call plgfam(fam2, num2, bmax2) + write(*,'(A,I1,I3,I5)') 'family parameters: fam, num, bmax = ', + & fam2, num2, bmax2 + if (fam2 .ne. fam1 .or. num2 .ne. num1 .or. bmax2 .ne. bmax1) then + write(stderr,*) 'plgfam test failed' + status = 1 + endif +c Restore values set initially by plparseopts. + call plsfam(fam0, num0, bmax0) + +c Test setting / getting page parameters before plinit +c Save values set by plparseopts to be restored later. + call plgpage(xp0, yp0, xleng0, yleng0, xoff0, yoff0) + xp1 = 200.d0 + yp1 = 200.d0 + xleng1 = 400 + yleng1 = 200 + xoff1 = 10 + yoff1 = 20 + call plspage(xp1, yp1, xleng1, yleng1, xoff1, yoff1) + +c Retrieve the same values? + call plgpage(xp2, yp2, xleng2, yleng2, xoff2, yoff2) + write(*,'(A,2F11.6, 2I4, 2I3)') + & 'page parameters: xp, yp, xleng, yleng, xoff, yoff =', + & xp2, yp2, xleng2, yleng2, xoff2, yoff2 + if (xp2 .ne. xp1 .or. yp2 .ne. yp1 .or. xleng2 .ne. xleng1 .or. + & yleng2 .ne. yleng1 .or. xoff2 .ne. xoff1 .or. + & yoff2 .ne. yoff1 ) then + write(stderr,*) 'plgpage test failed' + status = 1 + endif +c Restore values set initially by plparseopts. + call plspage(xp0, yp0, xleng0, yleng0, xoff0, yoff0) + c Test setting / getting compression parameter across plinit compression1 = 95 call plscompression(compression1) @@ -86,33 +133,9 @@ write(*,'(A,I2)') 'compression parameter = ', compression2 if (compression2 .ne. compression1) then write(stderr,*) 'plgcompression test failed' - status = 1; - endif - -c Test if device initialization screwed around with any of the -c preset familying values. - call plgfam(fam2, num2, bmax2); - write(*,'(A,I1,I3,I5)') 'family parameters: fam, num, bmax = ', - & fam2, num2, bmax2 - if (fam2 .ne. fam1 .or. num2 .ne. num1 .or. bmax2 .ne. bmax1) then - write(stderr,*) 'plgfam test failed\n' status = 1 endif -c Test if device initialization screwed around with any of the -c preset page values. - call plgpage(xp2, yp2, xleng2, yleng2, xoff2, yoff2) - write(*,'(A,2F11.6, 2I4, 2I3)') - & 'page parameters: xp, yp, xleng, yleng, xoff, yoff =', - & xp2, yp2, xleng2, yleng2, xoff2, yoff2 - if (xp2 .ne. xp1 .or. yp2 .ne. yp1 .or. xleng2 .ne. xleng1 .or. - & yleng2 .ne. yleng1 .or. xoff2 .ne. xoff1 .or. - & yoff2 .ne. yoff1 ) then - write(stderr,*) 'plgpage test failed' - status = 1; - endif - - c Exercise plscolor, plscol0, plscmap1, and plscmap1a to make sure c they work without any obvious error messages. call plscolor(1) @@ -137,8 +160,8 @@ write(stderr,*) 'plgvpd test failed' status = 1 endif - xmid = 0.5*(xmin+xmax); - ymid = 0.5*(ymin+ymax); + xmid = 0.5*(xmin+xmax) + ymid = 0.5*(ymin+ymax) call plwind(0.2d0, 0.3d0, 0.4d0, 0.5d0) call plgvpw(xmin, xmax, ymin, ymax) Modified: trunk/examples/f95/x31f.f90 =================================================================== --- trunk/examples/f95/x31f.f90 2009-02-23 21:13:04 UTC (rev 9592) +++ trunk/examples/f95/x31f.f90 2009-02-23 21:55:49 UTC (rev 9593) @@ -34,9 +34,10 @@ real(kind=plflt) xmid, ymid, wx, wy real(kind=plflt) mar, aspect, jx, jy, ori integer win, level2, digmax, digits, compression1, compression2 - real(kind=plflt) xp1, yp1, xp2, yp2 - integer xleng1, yleng1, xoff1, yoff1, xleng2, yleng2, xoff2, yoff2 - integer fam1, num1, bmax1, fam2, num2, bmax2, r, g, b + real(kind=plflt) xp0, yp0, xp1, yp1, xp2, yp2 + integer xleng0, yleng0, xoff0, yoff0, xleng1, yleng1, xoff1, yoff1 + integer xleng2, yleng2, xoff2, yoff2 + integer fam0, num0, bmax0, fam1, num1, bmax1, fam2, num2, bmax2, r, g, b real(kind=plflt) a integer r1(2), g1(2), b1(2) data r1 /0, 255/ @@ -55,17 +56,27 @@ call plparseopts(PL_PARSE_FULL) -! Test setting / getting compression parameter across plinit - compression1 = 95 - call plscompression(compression1) - -! Test setting / getting familying parameters across plinit +! Test setting / getting familying parameters before plinit + call plgfam(fam0, num0, bmax0) fam1 = 0 num1 = 10 bmax1 = 1000 call plsfam(fam1, num1, bmax1) -! Test setting / getting page parameters across plinit +! Retrieve the same values? + call plgfam(fam2, num2, bmax2) + write(*,'(A,I1,I3,I5)') 'family parameters: fam, num, bmax = ', & + fam2, num2, bmax2 + if (fam2 .ne. fam1 .or. num2 .ne. num1 .or. bmax2 .ne. bmax1) then + write(stderr,*) 'plgfam test failed\n' + status = 1 + endif +! Restore values set initially by plparseopts. + call plsfam(fam0, num0, bmax0) + +! Test setting / getting page parameters before plinit +! Save values set by plparseopts to be restored later. + call plgpage(xp0, yp0, xleng0, yleng0, xoff0, yoff0) xp1 = 200._plflt yp1 = 200._plflt xleng1 = 400 @@ -73,7 +84,25 @@ xoff1 = 10 yoff1 = 20 call plspage(xp1, yp1, xleng1, yleng1, xoff1, yoff1) - + +! Retrieve the same values? + call plgpage(xp2, yp2, xleng2, yleng2, xoff2, yoff2) + write(*,'(A,2F11.6, 2I4, 2I3)') & + 'page parameters: xp, yp, xleng, yleng, xoff, yoff =', & + xp2, yp2, xleng2, yleng2, xoff2, yoff2 + if (xp2 .ne. xp1 .or. yp2 .ne. yp1 .or. xleng2 .ne. xleng1 .or. & + yleng2 .ne. yleng1 .or. xoff2 .ne. xoff1 .or. & + yoff2 .ne. yoff1 ) then + write(stderr,*) 'plgpage test failed' + status = 1 + endif +! Restore values set initially by plparseopts. + call plspage(xp0, yp0, xleng0, yleng0, xoff0, yoff0) + +! Test setting / getting compression parameter across plinit + compression1 = 95 + call plscompression(compression1) + ! Initialize plplot call plinit() @@ -85,33 +114,9 @@ write(*,'(A,I2)') 'compression parameter = ', compression2 if (compression2 .ne. compression1) then write(stderr,*) 'plgcompression test failed' - status = 1; - endif - -! Test if device initialization screwed around with any of the -! preset familying values. - call plgfam(fam2, num2, bmax2); - write(*,'(A,I1,I3,I5)') 'family parameters: fam, num, bmax = ', & - fam2, num2, bmax2 - if (fam2 .ne. fam1 .or. num2 .ne. num1 .or. bmax2 .ne. bmax1) then - write(stderr,*) 'plgfam test failed\n' status = 1 endif -! Test if device initialization screwed around with any of the -! preset page values. - call plgpage(xp2, yp2, xleng2, yleng2, xoff2, yoff2) - write(*,'(A,2F11.6, 2I4, 2I3)') & - 'page parameters: xp, yp, xleng, yleng, xoff, yoff =', & - xp2, yp2, xleng2, yleng2, xoff2, yoff2 - if (xp2 .ne. xp1 .or. yp2 .ne. yp1 .or. xleng2 .ne. xleng1 .or. & - yleng2 .ne. yleng1 .or. xoff2 .ne. xoff1 .or. & - yoff2 .ne. yoff1 ) then - write(stderr,*) 'plgpage test failed' - status = 1; - endif - - ! Exercise plscolor, plscol0, plscmap1, and plscmap1a to make sure ! they work without any obvious error messages. call plscolor(1) @@ -136,8 +141,8 @@ write(stderr,*) 'plgvpd test failed' status = 1 endif - xmid = 0.5*(xmin+xmax); - ymid = 0.5*(ymin+ymax); + xmid = 0.5*(xmin+xmax) + ymid = 0.5*(ymin+ymax) call plwind(0.2_plflt, 0.3_plflt, 0.4_plflt, 0.5_plflt) call plgvpw(xmin, xmax, ymin, ymax) Modified: trunk/examples/java/x31.java =================================================================== --- trunk/examples/java/x31.java 2009-02-23 21:13:04 UTC (rev 9592) +++ trunk/examples/java/x31.java 2009-02-23 21:55:49 UTC (rev 9593) @@ -111,8 +111,9 @@ // Retrieve the same values? pls.gpage(xp2, yp2, xleng2, yleng2, xoff2, yoff2); System.out.println("page parameters: xp, yp, xleng, yleng, xoff, yoff = " - + xp2[0] + " " + yp2[0] + " " + xleng2[0] + " " - + yleng2[0] + " " + xoff2[0] + " " + yoff2[0]); + + nf.format(xp2[0]) + " " + nf.format(yp2[0]) + " " + + xleng2[0] + " " + yleng2[0] + " " + + xoff2[0] + " " + yoff2[0]); if (xp2[0] != xp1 || yp2[0] != yp1 || xleng2[0] != xleng1 || yleng2[0] != yleng1 || xoff2[0] != xoff1 || yoff2[0] != yoff1 ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2009-03-03 19:23:28
|
Revision: 9666 http://plplot.svn.sourceforge.net/plplot/?rev=9666&view=rev Author: andrewross Date: 2009-03-03 19:23:24 +0000 (Tue, 03 Mar 2009) Log Message: ----------- Update python, tcl and perl versions of example 31 consistent with the C version. Modified Paths: -------------- trunk/examples/perl/x31.pl trunk/examples/python/xw31.py trunk/examples/tcl/x31.tcl Modified: trunk/examples/perl/x31.pl =================================================================== --- trunk/examples/perl/x31.pl 2009-03-03 11:06:31 UTC (rev 9665) +++ trunk/examples/perl/x31.pl 2009-03-03 19:23:24 UTC (rev 9666) @@ -4,7 +4,8 @@ # # Window positioning demo. # -# Copyright (C) 2004 Rafael Laboissiere +# Copyright (C) 2008 Alan W. Irwin +# Copyright (C) 2008 Andrew Ross # # This file is part of PLplot. # @@ -29,30 +30,56 @@ plParseOpts (\@ARGV, PL_PARSE_SKIP | PL_PARSE_NOPROGRAM); -# Test setting / getting compression parameter across plinit. -my $compression1 = 95; -plscompression ($compression1); +my $status = 0; -# Test setting / getting familying parameters across plinit. +# Test setting / getting familying parameters before plinit +#z Save values set by plparseopts to be restored later. +my ($fam0, $num0, $bmax0) = plgfam (); my $fam1 = 0; my $num1 = 10; my $bmax1 = 1000; plsfam ($fam1, $num1, $bmax1); - -# Test setting / getting page parameters across plinit. + +# Retrieve the same values? +my ($fam2, $num2, $bmax2) = plgfam (); +printf("family parameters: fam, num, bmax = %d %d %d\n", $fam2, $num2, $bmax2); +if ($fam2 != $fam1 || $num2 != $num1 || $bmax2 != $bmax1) { + printf STDERR ("plgfam test failed\n"); + $status = 1; +} +# Restore values set initially by plparseopts. +plsfam($fam0, $num0, $bmax0); + +# Test setting / getting page parameters before plinit +# Save values set by plparseopts to be restored later. +my ($xp0, $yp0, $xleng0, $yleng0, $xoff0, $yoff0) = plgpage (); my $xp1 = 200.; my $yp1 = 200.; my $xleng1 = 400; my $yleng1 = 200; my $xoff1 = 10; my $yoff1 = 20; -plspage ($xp1, $yp1, $xleng1, $yleng1, $xoff1, $yoff1); +plspage($xp1, $yp1, $xleng1, $yleng1, $xoff1, $yoff1); + +# Retrieve the same values? +my ($xp2, $yp2, $xleng2, $yleng2, $xoff2, $yoff2) = plgpage (); +printf("page parameters: xp, yp, xleng, yleng, xoff, yoff = %f %f %d %d %d %d\n", $xp2, $yp2, $xleng2, $yleng2, $xoff2, $yoff2); +if ($xp2 != $xp1 || $yp2 != $yp1 || $xleng2 != $xleng1 || $yleng2 != $yleng1 || + $xoff2 != $xoff1 || $yoff2 != $yoff1 ) { + printf STDERR ("plgpage test failed\n"); + status = 1; +} +# Restore values set initially by plparseopts. +plspage($xp0, $yp0, $xleng0, $yleng0, $xoff0, $yoff0); + +# Test setting / getting compression parameter across plinit. +my $compression1 = 95; +plscompression ($compression1); + + # Initialize plplot - plinit (); -my $status = 0; - # Test if device initialization screwed around with the preset # compression parameter. my $compression2 = plgcompression (); @@ -64,24 +91,6 @@ $status = 1; } -# Test if device initialization screwed around with any of the -# preset familying values. -my ($fam2, $num2, $bmax2) = plgfam (); -printf ("family parameters: fam, num, bmax = %d %d %d\n", $fam2, $num2, $bmax2); -if ($fam2 != $fam1 || $num2 != $num1 || $bmax2 != $bmax1) { - printf STDERR ("plgfam test failed\n"); - $status = 1; -} - -# Test if device initialization screwed around with any of the -# preset page values. -my ($xp2, $yp2, $xleng2, $yleng2, $xoff2, $yoff2) = plgpage (); -printf ("page parameters: xp, yp, xleng, yleng, xoff, yoff = %f %f %d %d %d %d\n", $xp2, $yp2, $xleng2, $yleng2, $xoff2, $yoff2); -if ($xp2 != $xp1 || $yp2 != $yp1 || $xleng2 != $xleng1 || $yleng2 != $yleng1 || $xoff2 != $xoff1 || $yoff2 != $yoff1) { - printf STDERR ("plgpage test failed\n"); - $status = 1; -} - # Exercise plscolor, plscol0, plscmap1, and plscmap1a to make sure # they work without any obvious error messages. plscolor (1); Modified: trunk/examples/python/xw31.py =================================================================== --- trunk/examples/python/xw31.py 2009-03-03 11:06:31 UTC (rev 9665) +++ trunk/examples/python/xw31.py 2009-03-03 19:23:24 UTC (rev 9666) @@ -30,17 +30,26 @@ # Parse and process command line arguments plparseopts(sys.argv, PL_PARSE_FULL) -# Test setting / getting compression parameter across plinit. -compression1 = 95 -plscompression(compression1) - -# Test setting / getting familying parameters across plinit. +# Test setting / getting familying parameters before plinit +# Save values set by plparseopts to be restored later. +(fam0, num0, bmax0) = plgfam() fam1 = False num1 = 10 bmax1 = 1000 plsfam(fam1, num1, bmax1) - -# Test setting / getting page parameters across plinit. + +# Retrieve the same values? +(fam2, num2, bmax2) = plgfam() +sys.stdout.write("family parameters: fam, num, bmax = %d %d %d\n" % (fam2, num2, bmax2)) +if fam2 != fam1 or num2 != num1 or bmax2 != bmax1: + sys.stderr.write("plgfam test failed\n") + status = 1 +# Restore values set initially by plparseopts. +plsfam(fam0, num0, bmax0) + +# Test setting / getting page parameters before plinit. +# Save values set by plparseopts to be restored later. +(xp0, yp0, xleng0, yleng0, xoff0, yoff0) = plgpage() xp1 = 200. yp1 = 200. xleng1 = 400 @@ -48,7 +57,18 @@ xoff1 = 10 yoff1 = 20 plspage(xp1, yp1, xleng1, yleng1, xoff1, yoff1) +(xp2, yp2, xleng2, yleng2, xoff2, yoff2) = plgpage() +sys.stdout.write("page parameters: xp, yp, xleng, yleng, xoff, yoff = %f %f %d %d %d %d\n" % (xp2, yp2, xleng2, yleng2, xoff2, yoff2)) +if xp2 != xp1 or yp2 != yp1 or xleng2 != xleng1 or yleng2 != yleng1 or xoff2 != xoff1 or yoff2 != yoff1: + sys.stderr.write("plgpage test failed\n") + status = 1 +# Restore values set initially by plparseopts. +plspage(xp0, yp0, xleng0, yleng0, xoff0, yoff0) +# Test setting / getting compression parameter across plinit. +compression1 = 95 +plscompression(compression1) + # Initialize plplot plinit() @@ -67,22 +87,6 @@ sys.stderr.write("plgcompression test failed\n") status = 1 - # Test if device initialization screwed around with any of the - # preset familying values. - (fam2, num2, bmax2) = plgfam() - sys.stdout.write("family parameters: fam, num, bmax = %d %d %d\n" % (fam2, num2, bmax2)) - if fam2 != fam1 or num2 != num1 or bmax2 != bmax1: - sys.stderr.write("plgfam test failed\n") - status = 1 - - # Test if device initialization screwed around with any of the - # preset page values. - (xp2, yp2, xleng2, yleng2, xoff2, yoff2) = plgpage() - sys.stdout.write("page parameters: xp, yp, xleng, yleng, xoff, yoff = %f %f %d %d %d %d\n" % (xp2, yp2, xleng2, yleng2, xoff2, yoff2)) - if xp2 != xp1 or yp2 != yp1 or xleng2 != xleng1 or yleng2 != yleng1 or xoff2 != xoff1 or yoff2 != yoff1: - sys.stderr.write("plgpage test failed\n") - status = 1 - # Exercise plscolor, plscol0, plscmap1, and plscmap1a to make sure # they work without any obvious error messages. plscolor(1) Modified: trunk/examples/tcl/x31.tcl =================================================================== --- trunk/examples/tcl/x31.tcl 2009-03-03 11:06:31 UTC (rev 9665) +++ trunk/examples/tcl/x31.tcl 2009-03-03 19:23:24 UTC (rev 9666) @@ -7,15 +7,28 @@ # this constant should be defined centrally. set PL_NOTSET -42 - set compression1 95 - $w cmd plscompression $compression1 - # Test setting / getting familying parameters across plinit. + # Test setting / getting familying parameters before plinit. + # Save values set by plparseopts to be restored later. + + $w cmd plgfam fam0 num0 bmax0 set fam1 0 set num1 10 set bmax1 1000 $w cmd plsfam $fam1 $num1 $bmax1 + + # Retrieve the same values? + $w cmd plgfam fam2 num2 bmax2 + puts [ format "family parameters: fam, num, bmax = %d %d %d" $fam2 $num2 $bmax2 ] + if {$fam2 != $fam1 || $num2 != $num1 || $bmax2 != $bmax1} { + puts stderr "plgfam test failed" + set status 1 + } + # Restore values set initially by plparseopts. + $w cmd plsfam $fam0 $num0 $bmax0 - # Test setting / getting page parameters across plinit. + # Test setting / getting page parameters before plinit. + # Save values set by plparseopts to be restored later. + $w cmd plgpage xp0 yp0 xleng0 yleng0 xoff0 yoff0 set xp1 200. set yp1 200. set xleng1 400 @@ -24,6 +37,20 @@ set yoff1 20 $w cmd plspage $xp1 $yp1 $xleng1 $yleng1 $xoff1 $yoff1 + # Retrieve the same values? + $w cmd plgpage xp2 yp2 xleng2 yleng2 xoff2 yoff2 + puts [ format "page parameters: xp, yp, xleng, yleng, xoff, yoff = %f %f %d %d %d %d" $xp2 $yp2 $xleng2 $yleng2 $xoff2 $yoff2 ] + if {$xp2 != $xp1 || $yp2 != $yp1 || $xleng2 != $xleng1 || $yleng2 != $yleng1 || $xoff2 != $xoff1 || $yoff2 != $yoff1} { + puts stderr "plgpage test failed" + set status 1 + } + # Restore values set initially by plparseopts. + $w cmd plspage $xp0 $yp0 $xleng0 $yleng0 $xoff0 $yoff0 + + # Test setting / getting compression parameter across plinit. + set compression1 95 + $w cmd plscompression $compression1 + $w cmd plinit set status 0 @@ -38,24 +65,6 @@ set status 1 } - # Test if device initialization screwed around with any of the - # preset familying values. - $w cmd plgfam fam2 num2 bmax2 - puts [ format "family parameters: fam, num, bmax = %d %d %d" $fam2 $num2 $bmax2 ] - if {$fam2 != $fam1 || $num2 != $num1 || $bmax2 != $bmax1} { - puts stderr "plgfam test failed" - set status 1 - } - - # Test if device initialization screwed around with any of the - # preset page values. - $w cmd plgpage xp2 yp2 xleng2 yleng2 xoff2 yoff2 - puts [ format "page parameters: xp, yp, xleng, yleng, xoff, yoff = %f %f %d %d %d %d" $xp2 $yp2 $xleng2 $yleng2 $xoff2 $yoff2 ] - if {$xp2 != $xp1 || $yp2 != $yp1 || $xleng2 != $xleng1 || $yleng2 != $yleng1 || $xoff2 != $xoff1 || $yoff2 != $yoff1} { - puts stderr "plgpage test failed" - set status 1 - } - # Exercise plscolor, plscol0, plscmap1, and plscmap1a to make sure # they work without any obvious error messages. $w cmd plscolor 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-03-10 19:50:09
|
Revision: 9703 http://plplot.svn.sourceforge.net/plplot/?rev=9703&view=rev Author: airwin Date: 2009-03-10 19:50:01 +0000 (Tue, 10 Mar 2009) Log Message: ----------- Add cgm device and all qt file-related devices to installed examples test. Modified Paths: -------------- trunk/examples/CMakeLists.txt trunk/examples/Makefile.examples.in Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-03-10 18:38:46 UTC (rev 9702) +++ trunk/examples/CMakeLists.txt 2009-03-10 19:50:01 UTC (rev 9703) @@ -200,6 +200,42 @@ set(COMPARE_COMMENT "#") endif(NOT DIFF_EXECUTABLE OR NOT TAIL_EXECUTABLE) +if(NOT PLD_cgm) + set(CGM_COMMENT "#") +endif(NOT PLD_cgm) + +if(NOT PLD_bmpqt) + set(BMPQT_COMMENT "#") +endif(NOT PLD_bmpqt) + +if(NOT PLD_jpgqt) + set(JPGQT_COMMENT "#") +endif(NOT PLD_jpgqt) + +if(NOT PLD_pngqt) + set(PNGQT_COMMENT "#") +endif(NOT PLD_pngqt) + +if(NOT PLD_ppmqt) + set(PPMQT_COMMENT "#") +endif(NOT PLD_ppmqt) + +if(NOT PLD_tiffqt) + set(TIFFQT_COMMENT "#") +endif(NOT PLD_tiffqt) + +if(NOT PLD_svgqt) + set(SVGQT_COMMENT "#") +endif(NOT PLD_svgqt) + +if(NOT PLD_epsqt) + set(EPSQT_COMMENT "#") +endif(NOT PLD_epsqt) + +if(NOT PLD_pdfqt) + set(PDFQT_COMMENT "#") +endif(NOT PLD_pdfqt) + configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Makefile.examples.in ${CMAKE_CURRENT_BINARY_DIR}/Makefile.examples Modified: trunk/examples/Makefile.examples.in =================================================================== --- trunk/examples/Makefile.examples.in 2009-03-10 18:38:46 UTC (rev 9702) +++ trunk/examples/Makefile.examples.in 2009-03-10 19:50:01 UTC (rev 9703) @@ -154,68 +154,102 @@ @PDFCAIRO_COMMENT@ @echo Generate C results for pdfcairo device @PDFCAIRO_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=pdfcairo @PDFCAIRO_COMMENT@test: x01c.pdfcairo -@PDFCAIRO_COMMENT@@COMPARE_COMMENT@compare: x01c.pdfcairo @PNG...@x0...gcairo: c/x01c@EXEEXT@ @PNGCAIRO_COMMENT@ @echo Generate C results for pngcairo device @PNGCAIRO_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=pngcairo @PNGCAIRO_COMMENT@test: x01c01.pngcairo -@PNGCAIRO_COMMENT@@COMPARE_COMMENT@compare: x01c01.pngcairo @PSC...@x0...cairo: c/x01c@EXEEXT@ @PSCAIRO_COMMENT@ @echo Generate C results for pscairo device @PSCAIRO_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=pscairo @PSCAIRO_COMMENT@test: x01c.pscairo -@PSCAIRO_COMMENT@@COMPARE_COMMENT@compare: x01c.pscairo @SVG...@x0...gcairo: c/x01c@EXEEXT@ @SVGCAIRO_COMMENT@ @echo Generate C results for svgcairo device @SVGCAIRO_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=svgcairo @SVGCAIRO_COMMENT@test: x01c01.svgcairo -@SVGCAIRO_COMMENT@@COMPARE_COMMENT@compare: x01c01.svgcairo @GIF...@x0...f : c/x01c@EXEEXT@ @GIF_COMMENT@ @echo Generate C results for gif device @GIF_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=gif @GIF_COMMENT@test: x01c01.gif -@GIF_COMMENT@@COMPARE_COMMENT@compare: x01c01.gif @JPE...@x0...eg: c/x01c@EXEEXT@ @JPEG_COMMENT@ @echo Generate C results for jpeg device @JPEG_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=jpeg @JPEG_COMMENT@test: x01c01.jpeg -@JPEG_COMMENT@@COMPARE_COMMENT@compare: x01c01.jpeg @PNG...@x0...g: c/x01c@EXEEXT@ @PNG_COMMENT@ @echo Generate C results for png device @PNG_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=png @PNG_COMMENT@test: x01c01.png -@PNG_COMMENT@@COMPARE_COMMENT@compare: x01c01.png @PST...@x0...ttfc: c/x01c@EXEEXT@ @PSTTFC_COMMENT@ @echo Generate C results for psttfc device @PSTTFC_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=psttfc @PSTTFC_COMMENT@test: x01c.psttfc -@PSTTFC_COMMENT@@COMPARE_COMMENT@compare: x01c.psttfc @SVG...@x0...g: c/x01c@EXEEXT@ @SVG_COMMENT@ @echo Generate C results for svg device @SVG_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=svg @SVG_COMMENT@test: x01c01.svg -@SVG_COMMENT@@COMPARE_COMMENT@compare: x01c01.svg @XFIG_COMMENT@x01c01.xfig: c/x01c@EXEEXT@ @XFIG_COMMENT@ @echo Generate C results for xfig device @XFIG_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=xfig @XFIG_COMMENT@test: x01c01.xfig -@XFIG_COMMENT@@COMPARE_COMMENT@compare: x01c01.xfig @PST...@x0...tex: c/x01c@EXEEXT@ @PSTEX_COMMENT@ @echo Generate C results for pstex device @PSTEX_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=pstex @PSTEX_COMMENT@test: x01c.pstex -@PSTEX_COMMENT@@COMPARE_COMMENT@compare: x01c.pstex +@CGM...@x0...m : c/x01c@EXEEXT@ +@CGM_COMMENT@ @echo Generate C results for cgm device +@CGM_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=cgm +@CGM_COMMENT@test: x01c.cgm + +@BMP...@x0...pqt : c/x01c@EXEEXT@ +@BMPQT_COMMENT@ @echo Generate C results for bmpqt device +@BMPQT_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=bmpqt +@BMPQT_COMMENT@test: x01c01.bmpqt + +@JPG...@x0...gqt : c/x01c@EXEEXT@ +@JPGQT_COMMENT@ @echo Generate C results for jpgqt device +@JPGQT_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=jpgqt +@JPGQT_COMMENT@test: x01c01.jpgqt + +@PNG...@x0...gqt : c/x01c@EXEEXT@ +@PNGQT_COMMENT@ @echo Generate C results for pngqt device +@PNGQT_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=pngqt +@PNGQT_COMMENT@test: x01c01.pngqt + +@PPMQT_COMMENT@x01c01.ppmqt : c/x01c@EXEEXT@ +@PPMQT_COMMENT@ @echo Generate C results for ppmqt device +@PPMQT_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=ppmqt +@PPMQT_COMMENT@test: x01c01.ppmqt + +@TIFFQT_COMMENT@x01c01.tiffqt : c/x01c@EXEEXT@ +@TIFFQT_COMMENT@ @echo Generate C results for tiffqt device +@TIFFQT_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=tiffqt +@TIFFQT_COMMENT@test: x01c01.tiffqt + +@SVG...@x0...gqt : c/x01c@EXEEXT@ +@SVGQT_COMMENT@ @echo Generate C results for svgqt device +@SVGQT_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=svgqt +@SVGQT_COMMENT@test: x01c01.svgqt + +@EPSQT_COMMENT@x01c01.epsqt : c/x01c@EXEEXT@ +@EPSQT_COMMENT@ @echo Generate C results for epsqt device +@EPSQT_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=epsqt +@EPSQT_COMMENT@test: x01c01.epsqt + +@PDFQT_COMMENT@x01c01.pdfqt : c/x01c@EXEEXT@ +@PDFQT_COMMENT@ @echo Generate C results for pdfqt device +@PDFQT_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=pdfqt +@PDFQT_COMMENT@test: x01c01.pdfqt + @COMPARE_COMMENT@compare: @COMPARE_COMMENT@ @echo Compare non-C language psc and stdout results with corresponding C results @COMPARE_COMMENT@ -./test_diff.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-04-18 01:01:31
|
Revision: 9818 http://plplot.svn.sourceforge.net/plplot/?rev=9818&view=rev Author: airwin Date: 2009-04-18 01:01:29 +0000 (Sat, 18 Apr 2009) Log Message: ----------- Implement using the pkg-config method to build Alban Rochel's simple Qt GUI application in the installed examples tree. Modified Paths: -------------- trunk/examples/CMakeLists.txt trunk/examples/c++/CMakeLists.txt trunk/examples/c++/Makefile.examples.in Added Paths: ----------- trunk/examples/c++/README.qt_example Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-04-18 00:57:03 UTC (rev 9817) +++ trunk/examples/CMakeLists.txt 2009-04-18 01:01:29 UTC (rev 9818) @@ -23,6 +23,11 @@ get_target_property(_LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH) 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}") + endif(PLD_extqt) endif(USE_RPATH) # Install lena.pgm in installed examples directory so that all implementations Modified: trunk/examples/c++/CMakeLists.txt =================================================================== --- trunk/examples/c++/CMakeLists.txt 2009-04-18 00:57:03 UTC (rev 9817) +++ trunk/examples/c++/CMakeLists.txt 2009-04-18 01:01:29 UTC (rev 9818) @@ -97,8 +97,12 @@ set(wxPLplotDemo_SRCS wxPLplotDemo.cpp) endif(ENABLE_wxwidgets) -install(FILES ${cxx_SRCS} ${wxPLplotDemo_SRCS} DESTINATION ${DATA_DIR}/examples/c++) +if(PLD_extqt) + set(qt_INSTALLED_FILES qt_PlotWindow.cpp qt_PlotWindow.h qt_example.cpp README.qt_example) +endif(PLD_extqt) +install(FILES ${cxx_SRCS} ${wxPLplotDemo_SRCS} ${qt_INSTALLED_FILES} DESTINATION ${DATA_DIR}/examples/c++) + set(CXX ${CMAKE_CXX_COMPILER}) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Makefile.examples.in Modified: trunk/examples/c++/Makefile.examples.in =================================================================== --- trunk/examples/c++/Makefile.examples.in 2009-04-18 00:57:03 UTC (rev 9817) +++ trunk/examples/c++/Makefile.examples.in 2009-04-18 01:01:29 UTC (rev 9818) @@ -27,10 +27,15 @@ @pkg_config_true@LIB_TAG = @LIB_TAG@ @pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ @pkg_config_true@RPATHCMD = @RPATHCMD@ +@qt_gui_true@QT_MOC_EXECUTABLE = @QT_MOC_EXECUTABLE@ +@qt_gui_true@@pkg_config_true@qt_RPATHCMD = @qt_RPATHCMD@ @wxwidgets_true@@pkg_config_true@PLPLOTWXWIDGETS_EXECUTABLES_list = \ @wxwidgets_true@@pkg_config_true@ wxPLplotDemo$(EXEEXT) +@qt_gui_true@@pkg_config_true@qt_gui_EXECUTABLES_list = \ +@qt_gui_true@@pkg_config_true@ qt_example$(EXEEXT) + EXECUTABLES_list = \ x01cc$(EXEEXT) \ x01$(EXEEXT) \ @@ -64,8 +69,10 @@ x29$(EXEEXT) \ x30$(EXEEXT) \ x31$(EXEEXT) \ - $(PLPLOTWXWIDGETS_EXECUTABLES_list) + $(PLPLOTWXWIDGETS_EXECUTABLES_list) \ + $(qt_gui_EXECUTABLES_list) + all: $(EXECUTABLES_list) clean: @@ -74,6 +81,12 @@ @wxwidgets_true@@pkg_config_true@wxPLplotDemo$(EXEEXT): wxPLplotDemo.cpp @wxwidgets_true@@pkg_config_true@ $(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-wxwidgets` +@qt_gui_true@@pkg_config_true@moc_qt_PlotWindow.cpp: qt_PlotWindow.h +@qt_gui_true@@pkg_config_true@ $(QT_MOC_EXECUTABLE) `$(PKG_CONFIG_ENV) pkg-config --cflags plplot$(LIB_TAG)-qt` $< -o $@ + +@qt_gui_true@@pkg_config_true@qt_example$(EXEEXT): qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp +@qt_gui_true@@pkg_config_true@ $(CXX) qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp -o $@ $(qt_RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-qt` + .cc$(EXEEXT): @pkg_config_true@ $(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-c++` @pkg_config_false@ $(CXX) $< -o $@ `plplot-config --cflags --libs --with-c++` Added: trunk/examples/c++/README.qt_example =================================================================== --- trunk/examples/c++/README.qt_example (rev 0) +++ trunk/examples/c++/README.qt_example 2009-04-18 01:01:29 UTC (rev 9818) @@ -0,0 +1,14 @@ +The files qt_example.cpp, qt_PlotWindow.cpp, and qt_PlotWindow.h contain +source code for a simple example demonstrating how to access the PLplot API +from a Qt GUI application. + +You build this simple Qt example by running + +make qt_example + +Inside the Makefile you will see the details of how this example should be +built including the pkg-config commands that should be run to obtain the +correct arguments for moc and g++. We suggest you follow this simple +pkg-config build method when building your own Qt GUI application which uses +PLplot. + Property changes on: trunk/examples/c++/README.qt_example ___________________________________________________________________ Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-02 06:17:11
|
Revision: 9879 http://plplot.svn.sourceforge.net/plplot/?rev=9879&view=rev Author: airwin Date: 2009-05-02 06:17:06 +0000 (Sat, 02 May 2009) Log Message: ----------- Build and run D examples in the installed examples tree as part of "make test" command. Modified Paths: -------------- trunk/examples/CMakeLists.txt trunk/examples/Makefile.examples.in Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-05-02 05:49:28 UTC (rev 9878) +++ trunk/examples/CMakeLists.txt 2009-05-02 06:17:06 UTC (rev 9879) @@ -91,6 +91,9 @@ 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 @@ -103,6 +106,10 @@ set(PSC_CXX_COMMENT "#") endif(NOT ENABLE_cxx) + if(NOT ENABLE_d) + set(PSC_D_COMMENT "#") + endif(NOT ENABLE_d) + if(NOT ENABLE_f77) set(PSC_F77_COMMENT "#") endif(NOT ENABLE_f77) @@ -143,6 +150,7 @@ set(PSC_ADA_COMMENT "#") set(PSC_C_COMMENT "#") set(PSC_CXX_COMMENT "#") + set(PSC_D_COMMENT "#") set(PSC_F77_COMMENT "#") set(PSC_F95_COMMENT "#") set(PSC_JAVA_COMMENT "#") Modified: trunk/examples/Makefile.examples.in =================================================================== --- trunk/examples/Makefile.examples.in 2009-05-02 05:49:28 UTC (rev 9878) +++ trunk/examples/Makefile.examples.in 2009-05-02 06:17:06 UTC (rev 9879) @@ -68,6 +68,20 @@ # Just for c, c++, and tk directories @PSC_CXX_COMMENT@test_interactive: c++/x01@EXEEXT@ +# Temporary use 3rd example until first example is done. +@PSC_D_COMMENT@all: d/x03d@EXEEXT@ +@PSC_D_COMMENT@d/x03d@EXEEXT@: +@PSC_D_COMMENT@ cd d; $(MAKE) +@PSC_D_COMMENT@d_clean: +@PSC_D_COMMENT@ cd d; $(MAKE) clean +@PSC_D_COMMENT@.PHONY: d_clean +@PSC_D_COMMENT@clean: d_clean +@PSC...@x0...c: d/x03d@EXEEXT@ +@PSC_D_COMMENT@ @echo Generate d results for psc device +@PSC_D_COMMENT@ ./plplot-test.sh --verbose --front-end=d --device=psc +@PSC_D_COMMENT@test: x03d.psc +@PSC_D_COMMENT@@COMPARE_COMMENT@compare: x03d.psc + @PSC_F77_COMMENT@all: f77/x01f@EXEEXT@ @PSC_F77_COMMENT@f77/x01f@EXEEXT@: @PSC_F77_COMMENT@ cd f77; $(MAKE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-14 01:22:47
|
Revision: 9977 http://plplot.svn.sourceforge.net/plplot/?rev=9977&view=rev Author: airwin Date: 2009-05-14 00:16:19 +0000 (Thu, 14 May 2009) Log Message: ----------- Add custom target "test_noninteractive" to new CMake-based build system for installed examples. Through dependencies this builds the examples, runs them for the psc device, and compares the PostScript and stdout results for non-C languages with the C language results using the existing test_diff.sh script. The current set of languages covered is Ada, C, C++, D, Fortran 77, and Fortran 95, but more languages will eventually follow to duplicate the functionality of the current Makefile+pkg-config approach used for the installed examples in a cross-platform way. Modified Paths: -------------- trunk/examples/CMakeLists.txt_installed_examples trunk/examples/ada/CMakeLists.txt_installed_examples_ada trunk/examples/c/CMakeLists.txt_installed_examples_c trunk/examples/c++/CMakeLists.txt_installed_examples_cxx trunk/examples/d/CMakeLists.txt_installed_examples_d trunk/examples/f77/CMakeLists.txt_installed_examples_f77 trunk/examples/f95/CMakeLists.txt_installed_examples_f95 trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/CMakeLists.txt_installed_examples =================================================================== --- trunk/examples/CMakeLists.txt_installed_examples 2009-05-12 22:50:43 UTC (rev 9976) +++ trunk/examples/CMakeLists.txt_installed_examples 2009-05-14 00:16:19 UTC (rev 9977) @@ -19,35 +19,95 @@ # along with PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -project(installed_plplot_examples) +project(installed_plplot_examples NONE) CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4 FATAL_ERROR) # Location where PLplot cmake build system first looks for cmake modules. set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules) -#Configurable items. +#Configure variables and enable languages as needed. include(plplot_configure) include(export_plplot) add_subdirectory(c) +get_property(targets_examples_c GLOBAL PROPERTY TARGETS_examples_c) +set(language_info_LIST c:c) +if(ENABLE_ada) + add_subdirectory(ada) + get_property(targets_examples_ada GLOBAL PROPERTY TARGETS_examples_ada) + list(APPEND language_info_LIST ada:a) +endif(ENABLE_ada) + if(ENABLE_cxx) add_subdirectory(c++) + get_property(targets_examples_cxx GLOBAL PROPERTY TARGETS_examples_cxx) + list(APPEND language_info_LIST cxx:cxx) endif(ENABLE_cxx) if(ENABLE_f77) add_subdirectory(f77) + get_property(targets_examples_f77 GLOBAL PROPERTY TARGETS_examples_f77) + list(APPEND language_info_LIST f77:f) endif(ENABLE_f77) if(ENABLE_f95) add_subdirectory(f95) + get_property(targets_examples_f95 GLOBAL PROPERTY TARGETS_examples_f95) + list(APPEND language_info_LIST f95:f95) endif(ENABLE_f95) if(ENABLE_d) add_subdirectory(d) + get_property(targets_examples_d GLOBAL PROPERTY TARGETS_examples_d) + list(APPEND language_info_LIST d:d) endif(ENABLE_d) -if(ENABLE_ada) - add_subdirectory(ada) -endif(ENABLE_ada) +# Octave not configured yet so the following stanza ignored for now. +if(ENABLE_octave) + add_subdirectory(octave) + execute_process( + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${CMAKE_CURRENT_SOURCE_DIR}/lena.img + ${CMAKE_CURRENT_BINARY_DIR}/lena.img + ) + execute_process( + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${CMAKE_CURRENT_SOURCE_DIR}/octave/lena.img + ${CMAKE_CURRENT_BINARY_DIR}/octave/lena.img + ) +endif(ENABLE_octave) +execute_process( + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${CMAKE_CURRENT_SOURCE_DIR}/lena.pgm + ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm + ) + +set(output_LIST) +foreach(language_info ${language_info_LIST}) + string(REGEX REPLACE "^(.*):.*$" "\\1" language ${language_info}) + string(REGEX REPLACE "^.*:(.*)$" "\\1" suffix ${language_info}) + + # Will change from x03 to x01 as the representative result below when + # standard example 1 is implemented in d. + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/x03${suffix}.psc + COMMAND ${CMAKE_COMMAND} -E echo "Generate ${language} results for psc device" + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh --verbose --front-end=${language} --device=psc + DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh + ${targets_examples_${language}} + ) + list(APPEND output_LIST ${CMAKE_CURRENT_BINARY_DIR}/x03${suffix}.psc) +endforeach(language_info ${language_info_LIST}) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/compare + COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/compare + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/test_diff.sh + DEPENDS ${output_LIST} + ) + +add_custom_target(test_noninteractive +DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/compare) Modified: trunk/examples/ada/CMakeLists.txt_installed_examples_ada =================================================================== --- trunk/examples/ada/CMakeLists.txt_installed_examples_ada 2009-05-12 22:50:43 UTC (rev 9976) +++ trunk/examples/ada/CMakeLists.txt_installed_examples_ada 2009-05-14 00:16:19 UTC (rev 9977) @@ -112,4 +112,5 @@ "-aI${CMAKE_SOURCE_DIR}/ada -aI${ADA_INCLUDE_DIR} -aL${ADA_LIB_DIR}" ) target_link_libraries(${TARGET_NAME} plplotada${LIB_TAG}) + set_property(GLOBAL APPEND PROPERTY TARGETS_examples_ada ${TARGET_NAME}) endforeach(STRING_INDEX ${ada_STRING_INDICES}) Modified: trunk/examples/c/CMakeLists.txt_installed_examples_c =================================================================== --- trunk/examples/c/CMakeLists.txt_installed_examples_c 2009-05-12 22:50:43 UTC (rev 9976) +++ trunk/examples/c/CMakeLists.txt_installed_examples_c 2009-05-14 00:16:19 UTC (rev 9977) @@ -58,4 +58,5 @@ foreach(STRING_INDEX ${c_STRING_INDICES}) add_executable(x${STRING_INDEX}c x${STRING_INDEX}c.c) target_link_libraries(x${STRING_INDEX}c plplot${LIB_TAG} ${MATH_LIB}) + set_property(GLOBAL APPEND PROPERTY TARGETS_examples_c x${STRING_INDEX}c) endforeach(STRING_INDEX ${c_STRING_INDICES}) Modified: trunk/examples/c++/CMakeLists.txt_installed_examples_cxx =================================================================== --- trunk/examples/c++/CMakeLists.txt_installed_examples_cxx 2009-05-12 22:50:43 UTC (rev 9976) +++ trunk/examples/c++/CMakeLists.txt_installed_examples_cxx 2009-05-14 00:16:19 UTC (rev 9977) @@ -57,4 +57,5 @@ foreach(STRING_INDEX ${cxx_STRING_INDICES}) add_executable(x${STRING_INDEX} x${STRING_INDEX}.cc) target_link_libraries(x${STRING_INDEX} plplotcxx${LIB_TAG} ${MATH_LIB}) + set_property(GLOBAL APPEND PROPERTY TARGETS_examples_cxx x${STRING_INDEX}) endforeach(STRING_INDEX ${cxx_STRING_INDICES}) Modified: trunk/examples/d/CMakeLists.txt_installed_examples_d =================================================================== --- trunk/examples/d/CMakeLists.txt_installed_examples_d 2009-05-12 22:50:43 UTC (rev 9976) +++ trunk/examples/d/CMakeLists.txt_installed_examples_d 2009-05-14 00:16:19 UTC (rev 9977) @@ -44,4 +44,5 @@ set(d_SRCS ${d_SRCS} x${STRING_INDEX}d.d) add_executable(x${STRING_INDEX}d x${STRING_INDEX}d.d) target_link_libraries(x${STRING_INDEX}d plplotdmd${LIB_TAG} plplot${LIB_TAG} ${MATH_LIB}) + set_property(GLOBAL APPEND PROPERTY TARGETS_examples_d x${STRING_INDEX}d) endforeach(STRING_INDEX ${d_STRING_INDICES}) Modified: trunk/examples/f77/CMakeLists.txt_installed_examples_f77 =================================================================== --- trunk/examples/f77/CMakeLists.txt_installed_examples_f77 2009-05-12 22:50:43 UTC (rev 9976) +++ trunk/examples/f77/CMakeLists.txt_installed_examples_f77 2009-05-14 00:16:19 UTC (rev 9977) @@ -61,4 +61,5 @@ else(STATIC_OPTS) target_link_libraries(x${STRING_INDEX}f plplotf77${LIB_TAG}) endif(STATIC_OPTS) + set_property(GLOBAL APPEND PROPERTY TARGETS_examples_f77 x${STRING_INDEX}f) endforeach(STRING_INDEX ${f77_STRING_INDICES}) Modified: trunk/examples/f95/CMakeLists.txt_installed_examples_f95 =================================================================== --- trunk/examples/f95/CMakeLists.txt_installed_examples_f95 2009-05-12 22:50:43 UTC (rev 9976) +++ trunk/examples/f95/CMakeLists.txt_installed_examples_f95 2009-05-14 00:16:19 UTC (rev 9977) @@ -66,4 +66,5 @@ else(STATIC_OPTS) target_link_libraries(x${STRING_INDEX}f95 plplotf95${LIB_TAG}) endif(STATIC_OPTS) + set_property(GLOBAL APPEND PROPERTY TARGETS_examples_f95 x${STRING_INDEX}f95) endforeach(STRING_INDEX ${f77_STRING_INDICES}) Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-12 22:50:43 UTC (rev 9976) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-14 00:16:19 UTC (rev 9977) @@ -3,23 +3,37 @@ set(LIB_TAG "@LIB_TAG@") set(INCLUDE_DIR @INCLUDE_DIR@) set(MATH_LIB @MATH_LIB@) + +# What computer languages do we have configured? +set(ENABLE_ada @ENABLE_ada@) set(ENABLE_cxx @ENABLE_cxx@) +set(ENABLE_d @ENABLE_d@) set(ENABLE_f77 @ENABLE_f77@) set(ENABLE_f95 @ENABLE_f95@) + +# Always enable C language. +enable_language(C) + +if(ENABLE_ada) + enable_language(Ada) + set(ADA_INCLUDE_DIR @ADA_INCLUDE_DIR@) + set(ADA_LIB_DIR @ADA_LIB_DIR@) +endif(ENABLE_ada) + +if(ENABLE_cxx) + enable_language(CXX) +endif(ENABLE_cxx) + +if(ENABLE_d) + enable_language(D) +endif(ENABLE_d) + if(ENABLE_F77 OR ENABLE_f95) set(STATIC_OPTS @STATIC_OPTS@) enable_language(Fortran) endif(ENABLE_F77 OR ENABLE_f95) + if(ENABLE_f95) set(F95_MOD_DIR @F95_MOD_DIR@) endif(ENABLE_f95) -set(ENABLE_d @ENABLE_d@) -if(ENABLE_d) - enable_language(D) -endif(ENABLE_d) -set(ENABLE_ada @ENABLE_ada@) -if(ENABLE_ada) - enable_language(Ada) - set(ADA_INCLUDE_DIR @ADA_INCLUDE_DIR@) - set(ADA_LIB_DIR @ADA_LIB_DIR@) -endif(ENABLE_ada) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-23 17:13:22
|
Revision: 9990 http://plplot.svn.sourceforge.net/plplot/?rev=9990&view=rev Author: airwin Date: 2009-05-23 17:13:15 +0000 (Sat, 23 May 2009) Log Message: ----------- Add java example build and test to new CMake-based build system for the installed examples tree. Since the java class file builds are done with custom commands rather than add_executable, must change dependency style for the test_noninteractive custom target and the custom commands it file-depends on. Modified Paths: -------------- trunk/examples/CMakeLists.txt_installed_examples trunk/examples/java/CMakeLists.txt trunk/examples/plplot_configure.cmake_installed_examples.in Added Paths: ----------- trunk/examples/java/CMakeLists.txt_installed_examples_java Modified: trunk/examples/CMakeLists.txt_installed_examples =================================================================== --- trunk/examples/CMakeLists.txt_installed_examples 2009-05-23 15:53:35 UTC (rev 9989) +++ trunk/examples/CMakeLists.txt_installed_examples 2009-05-23 17:13:15 UTC (rev 9990) @@ -63,6 +63,12 @@ list(APPEND language_info_LIST d:d) endif(ENABLE_d) +if(ENABLE_java) + add_subdirectory(java) + get_property(targets_examples_java GLOBAL PROPERTY TARGETS_examples_java) + list(APPEND language_info_LIST java:j) +endif(ENABLE_java) + # Octave not configured yet so the following stanza ignored for now. if(ENABLE_octave) add_subdirectory(octave) @@ -85,6 +91,7 @@ ) set(output_LIST) +set(targets_LIST) foreach(language_info ${language_info_LIST}) string(REGEX REPLACE "^(.*):.*$" "\\1" language ${language_info}) string(REGEX REPLACE "^.*:(.*)$" "\\1" suffix ${language_info}) @@ -97,9 +104,9 @@ COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh --verbose --front-end=${language} --device=psc DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh - ${targets_examples_${language}} ) list(APPEND output_LIST ${CMAKE_CURRENT_BINARY_DIR}/x03${suffix}.psc) + list(APPEND targets_LIST ${targets_examples_${language})) endforeach(language_info ${language_info_LIST}) add_custom_command( @@ -111,3 +118,4 @@ add_custom_target(test_noninteractive DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/compare) +add_dependencies(test_noninteractive ${targets_LIST}) Modified: trunk/examples/java/CMakeLists.txt =================================================================== --- trunk/examples/java/CMakeLists.txt 2009-05-23 15:53:35 UTC (rev 9989) +++ trunk/examples/java/CMakeLists.txt 2009-05-23 17:13:15 UTC (rev 9990) @@ -124,3 +124,8 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot.jar DESTINATION ${JAR_DIR} ) + +install(FILES CMakeLists.txt_installed_examples_java + DESTINATION ${DATA_DIR}/examples/java + RENAME CMakeLists.txt + ) Added: trunk/examples/java/CMakeLists.txt_installed_examples_java =================================================================== --- trunk/examples/java/CMakeLists.txt_installed_examples_java (rev 0) +++ trunk/examples/java/CMakeLists.txt_installed_examples_java 2009-05-23 17:13:15 UTC (rev 9990) @@ -0,0 +1,74 @@ +# java/CMakeLists.txt for installed PLplot examples +### Process this file with cmake to produce Makefile +### +# Copyright (C) 2009 Alan W. Irwin +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; version 2 of the License. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +set(java_STRING_INDICES +"01" +"02" +"03" +"04" +"05" +"06" +"07" +"08" +"09" +"10" +"11" +"12" +"13" +"14" +"15" +"16" +"17" +"18" +"19" +"20" +"21" +"22" +"23" +"24" +"25" +"26" +"27" +"28" +"29" +"30" +"31" +) + + +set(java_CLASSES) +set(INSTALLED_JAR_FILE ${JAR_DIR}/plplot.jar) + +foreach(STRING_INDEX ${java_STRING_INDICES}) + set(in_file ${CMAKE_CURRENT_SOURCE_DIR}/x${STRING_INDEX}.java) + set( + out_file + ${CMAKE_CURRENT_BINARY_DIR}/plplot/examples/x${STRING_INDEX}.class + ) + list(APPEND java_CLASSES ${out_file}) + add_custom_command( + OUTPUT ${out_file} + COMMAND ${CMAKE_Java_COMPILER} + -classpath ${INSTALLED_JAR_FILE} ${in_file} -d ${CMAKE_CURRENT_BINARY_DIR} -encoding utf8 + DEPENDS ${in_file} ${INSTALLED_JAR_FILE} + ) + add_custom_target(x${STRING_INDEX}j ALL DEPENDS ${out_file}) + set_property(GLOBAL APPEND PROPERTY TARGETS_examples_java x${STRING_INDEX}j) +endforeach(STRING_INDEX ${java_STRING_INDICES}) Property changes on: trunk/examples/java/CMakeLists.txt_installed_examples_java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-23 15:53:35 UTC (rev 9989) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-23 17:13:15 UTC (rev 9990) @@ -10,6 +10,7 @@ set(ENABLE_d @ENABLE_d@) set(ENABLE_f77 @ENABLE_f77@) set(ENABLE_f95 @ENABLE_f95@) +set(ENABLE_java @ENABLE_java@) # Always enable C language. enable_language(C) @@ -37,3 +38,9 @@ set(F95_MOD_DIR @F95_MOD_DIR@) endif(ENABLE_f95) +if(ENABLE_java) + enable_language(Java) + find_package(JNI) + set(JAR_DIR @JAR_DIR@) +endif(ENABLE_java) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-23 18:32:25
|
Revision: 9991 http://plplot.svn.sourceforge.net/plplot/?rev=9991&view=rev Author: airwin Date: 2009-05-23 18:32:20 +0000 (Sat, 23 May 2009) Log Message: ----------- Add Lua and Perl/PDL examples to new CMake-based build system for the installed examples tree. Modified Paths: -------------- trunk/examples/CMakeLists.txt_installed_examples trunk/examples/lua/CMakeLists.txt trunk/examples/plplot_configure.cmake_installed_examples.in Added Paths: ----------- trunk/examples/lua/CMakeLists.txt_installed_examples_lua Modified: trunk/examples/CMakeLists.txt_installed_examples =================================================================== --- trunk/examples/CMakeLists.txt_installed_examples 2009-05-23 17:13:15 UTC (rev 9990) +++ trunk/examples/CMakeLists.txt_installed_examples 2009-05-23 18:32:20 UTC (rev 9991) @@ -69,6 +69,16 @@ list(APPEND language_info_LIST java:j) endif(ENABLE_java) +if(ENABLE_lua) + add_subdirectory(lua) + get_property(targets_examples_java GLOBAL PROPERTY TARGETS_examples_lua) + list(APPEND language_info_LIST lua:lua) +endif(ENABLE_lua) + +if(ENABLE_pdl) + list(APPEND language_info_LIST perl:pdl) +endif(ENABLE_pdl) + # Octave not configured yet so the following stanza ignored for now. if(ENABLE_octave) add_subdirectory(octave) @@ -101,12 +111,14 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/x03${suffix}.psc COMMAND ${CMAKE_COMMAND} -E echo "Generate ${language} results for psc device" - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh --verbose --front-end=${language} --device=psc + COMMAND SRC_EXAMPLES_DIR=${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh --verbose --front-end=${language} --device=psc DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh ) list(APPEND output_LIST ${CMAKE_CURRENT_BINARY_DIR}/x03${suffix}.psc) - list(APPEND targets_LIST ${targets_examples_${language})) + if(targets_examples_${language}) + list(APPEND targets_LIST ${targets_examples_${language}}) + endif(targets_examples_${language}) endforeach(language_info ${language_info_LIST}) add_custom_command( Modified: trunk/examples/lua/CMakeLists.txt =================================================================== --- trunk/examples/lua/CMakeLists.txt 2009-05-23 17:13:15 UTC (rev 9990) +++ trunk/examples/lua/CMakeLists.txt 2009-05-23 18:32:20 UTC (rev 9991) @@ -118,3 +118,9 @@ PERMISSIONS ${PERM_DATA} RENAME plplot_examples.lua ) + +install(FILES CMakeLists.txt_installed_examples_lua + DESTINATION ${DATA_DIR}/examples/lua + RENAME CMakeLists.txt + ) + Added: trunk/examples/lua/CMakeLists.txt_installed_examples_lua =================================================================== --- trunk/examples/lua/CMakeLists.txt_installed_examples_lua (rev 0) +++ trunk/examples/lua/CMakeLists.txt_installed_examples_lua 2009-05-23 18:32:20 UTC (rev 9991) @@ -0,0 +1,81 @@ +# lua/CMakeLists.txt for installed PLplot examples +### Process this file with cmake to produce Makefile +### +# Copyright (C) 2009 Alan W. Irwin +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; version 2 of the License. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +set(lua_STRING_INDICES +"01" +"02" +"03" +"04" +"05" +"06" +"07" +"08" +"09" +"10" +"11" +"12" +"13" +"14" +"15" +"16" +"17" +"18" +"19" +"20" +"21" +"22" +"23" +"24" +"25" +"26" +"27" +"28" +"29" +"30" +"31" +) + +set(lua_SCRIPTS plplot_examples.lua) +foreach(STRING_INDEX ${lua_STRING_INDICES}) + set(lua_SCRIPTS ${lua_SCRIPTS} x${STRING_INDEX}.lua) +endforeach(STRING_INDEX ${lua_STRING_INDICES}) + +if(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + # equivalent to install commands but at "make" time rather than + # "make install" time, to the build tree if different than the source + # tree. + set(command_depends) + foreach(file ${lua_SCRIPTS}) + set( + command_DEPENDS + ${command_DEPENDS} + ${CMAKE_CURRENT_BINARY_DIR}/${file} + ) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${file} + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file} + ) + endforeach(file ${lua_SCRIPTS} ${lua_DATA}) + add_custom_target(lua_examples ALL DEPENDS ${command_DEPENDS}) + set_property(GLOBAL APPEND PROPERTY TARGETS_examples_lua lua_examples) +endif(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + Property changes on: trunk/examples/lua/CMakeLists.txt_installed_examples_lua ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-23 17:13:15 UTC (rev 9990) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-23 18:32:20 UTC (rev 9991) @@ -11,6 +11,8 @@ set(ENABLE_f77 @ENABLE_f77@) set(ENABLE_f95 @ENABLE_f95@) set(ENABLE_java @ENABLE_java@) +set(ENABLE_lua @ENABLE_lua@) +set(ENABLE_pdl @ENABLE_pdl@) # Always enable C language. enable_language(C) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-23 19:53:12
|
Revision: 9993 http://plplot.svn.sourceforge.net/plplot/?rev=9993&view=rev Author: airwin Date: 2009-05-23 19:53:06 +0000 (Sat, 23 May 2009) Log Message: ----------- Build and test ocaml examples with new CMake-based build system for the installed examples tree. Modified Paths: -------------- trunk/examples/CMakeLists.txt_installed_examples trunk/examples/ocaml/CMakeLists.txt trunk/examples/plplot_configure.cmake_installed_examples.in Added Paths: ----------- trunk/examples/ocaml/CMakeLists.txt_installed_examples_ocaml Modified: trunk/examples/CMakeLists.txt_installed_examples =================================================================== --- trunk/examples/CMakeLists.txt_installed_examples 2009-05-23 19:03:07 UTC (rev 9992) +++ trunk/examples/CMakeLists.txt_installed_examples 2009-05-23 19:53:06 UTC (rev 9993) @@ -71,10 +71,16 @@ if(ENABLE_lua) add_subdirectory(lua) - get_property(targets_examples_java GLOBAL PROPERTY TARGETS_examples_lua) + get_property(targets_examples_lua GLOBAL PROPERTY TARGETS_examples_lua) list(APPEND language_info_LIST lua:lua) endif(ENABLE_lua) +if(ENABLE_ocaml) + add_subdirectory(ocaml) + get_property(targets_examples_ocaml GLOBAL PROPERTY TARGETS_examples_ocaml) + list(APPEND language_info_LIST ocaml:ocaml) +endif(ENABLE_ocaml) + if(ENABLE_pdl) list(APPEND language_info_LIST perl:pdl) endif(ENABLE_pdl) Modified: trunk/examples/ocaml/CMakeLists.txt =================================================================== --- trunk/examples/ocaml/CMakeLists.txt 2009-05-23 19:03:07 UTC (rev 9992) +++ trunk/examples/ocaml/CMakeLists.txt 2009-05-23 19:53:06 UTC (rev 9993) @@ -105,3 +105,9 @@ DESTINATION ${DATA_DIR}/examples/ocaml RENAME Makefile ) + +install(FILES CMakeLists.txt_installed_examples_ocaml + DESTINATION ${DATA_DIR}/examples/ocaml + RENAME CMakeLists.txt + ) + Added: trunk/examples/ocaml/CMakeLists.txt_installed_examples_ocaml =================================================================== --- trunk/examples/ocaml/CMakeLists.txt_installed_examples_ocaml (rev 0) +++ trunk/examples/ocaml/CMakeLists.txt_installed_examples_ocaml 2009-05-23 19:53:06 UTC (rev 9993) @@ -0,0 +1,86 @@ +# -*- mode: cmake -*- +# ocaml/CMakeLists.txt for installed PLplot examples +### Process this file with cmake to produce Makefile +# +# +# Copyright (C) 2009 Alan W. Irwin +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; version 2 of the License. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +set(ocaml_STRING_INDICES + "01" + "02" + "03" + "04" + "05" + "06" + "07" + "08" + "09" + "10" + "11" + "12" + "13" + "14" + "15" + "16" + "17" + "18" + "19" + "20" + "21" + "22" + "23" + "24" + "25" + "26" + "27" + "28" + "29" + "30" + "31" + ) + +foreach(STRING_INDEX ${ocaml_STRING_INDICES}) + set(EXECUTABLE_NAME x${STRING_INDEX}ocaml) + set(SOURCE_FILE x${STRING_INDEX}.ml) + # Copy source code to build tree since ocamlc is a bit broken and will + # otherwise litter the source tree with intermediate files + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_FILE} + COMMAND ${CMAKE_COMMAND} + -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_FILE} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE_FILE} + ) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE_NAME} + COMMAND ${OCAMLC} + -g + -I ${OCAML_INSTALL_DIR}/plplot + -ccopt "-L ${CMAKE_INSTALL_LIBDIR} -Wl,-rpath -Wl,${CMAKE_INSTALL_LIBDIR} " + plplot.cma + -o ${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE_NAME} + ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_FILE} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_FILE} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + VERBATIM + ) + add_custom_target( + target_${EXECUTABLE_NAME} ALL + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE_NAME} + ) + set_property(GLOBAL APPEND PROPERTY TARGETS_examples_ocaml target_${EXECUTABLE_NAME}) +endforeach(STRING_INDEX ${ocaml_STRING_INDICES}) Property changes on: trunk/examples/ocaml/CMakeLists.txt_installed_examples_ocaml ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-23 19:03:07 UTC (rev 9992) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-23 19:53:06 UTC (rev 9993) @@ -12,6 +12,7 @@ set(ENABLE_f95 @ENABLE_f95@) set(ENABLE_java @ENABLE_java@) set(ENABLE_lua @ENABLE_lua@) +set(ENABLE_ocaml @ENABLE_ocaml@) set(ENABLE_pdl @ENABLE_pdl@) # Always enable C language. @@ -46,3 +47,8 @@ set(JAR_DIR @JAR_DIR@) endif(ENABLE_java) +if(ENABLE_ocaml) + set(OCAMLC @OCAMLC@) + set(CMAKE_INSTALL_LIBDIR @CMAKE_INSTALL_LIBDIR@) + set(OCAML_INSTALL_DIR @OCAML_INSTALL_DIR@) +endif(ENABLE_ocaml) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-23 20:22:32
|
Revision: 9994 http://plplot.svn.sourceforge.net/plplot/?rev=9994&view=rev Author: airwin Date: 2009-05-23 20:22:17 +0000 (Sat, 23 May 2009) Log Message: ----------- Add test of python examples to new CMake-based build system for the installed examples tree. Modified Paths: -------------- trunk/examples/CMakeLists.txt_installed_examples trunk/examples/plplot_configure.cmake_installed_examples.in trunk/examples/python/CMakeLists.txt Added Paths: ----------- trunk/examples/python/CMakeLists.txt_installed_examples_python Modified: trunk/examples/CMakeLists.txt_installed_examples =================================================================== --- trunk/examples/CMakeLists.txt_installed_examples 2009-05-23 19:53:06 UTC (rev 9993) +++ trunk/examples/CMakeLists.txt_installed_examples 2009-05-23 20:22:17 UTC (rev 9994) @@ -85,6 +85,12 @@ list(APPEND language_info_LIST perl:pdl) endif(ENABLE_pdl) +if(ENABLE_python) + add_subdirectory(python) + get_property(targets_examples_python GLOBAL PROPERTY TARGETS_examples_python) + list(APPEND language_info_LIST python:p) +endif(ENABLE_python) + # Octave not configured yet so the following stanza ignored for now. if(ENABLE_octave) add_subdirectory(octave) Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-23 19:53:06 UTC (rev 9993) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-23 20:22:17 UTC (rev 9994) @@ -14,6 +14,7 @@ set(ENABLE_lua @ENABLE_lua@) set(ENABLE_ocaml @ENABLE_ocaml@) set(ENABLE_pdl @ENABLE_pdl@) +set(ENABLE_python @ENABLE_python@) # Always enable C language. enable_language(C) @@ -52,3 +53,8 @@ set(CMAKE_INSTALL_LIBDIR @CMAKE_INSTALL_LIBDIR@) set(OCAML_INSTALL_DIR @OCAML_INSTALL_DIR@) endif(ENABLE_ocaml) + +if(ENABLE_python) + set(ENABLE_pygcw @ENABLE_pygcw@) +endif(ENABLE_python) + Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2009-05-23 19:53:06 UTC (rev 9993) +++ trunk/examples/python/CMakeLists.txt 2009-05-23 20:22:17 UTC (rev 9994) @@ -186,3 +186,9 @@ DESTINATION ${DATA_DIR}/examples/python PERMISSIONS ${PERM_DATA} ) + +install(FILES CMakeLists.txt_installed_examples_python + DESTINATION ${DATA_DIR}/examples/python + RENAME CMakeLists.txt + ) + Added: trunk/examples/python/CMakeLists.txt_installed_examples_python =================================================================== --- trunk/examples/python/CMakeLists.txt_installed_examples_python (rev 0) +++ trunk/examples/python/CMakeLists.txt_installed_examples_python 2009-05-23 20:22:17 UTC (rev 9994) @@ -0,0 +1,129 @@ +# python/CMakeLists.txt for installed PLplot examples +### Process this file with cmake to produce Makefile +### +# Copyright (C) 2009 Alan W. Irwin +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; version 2 of the License. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +# N.B. examples 14 and 17 handled independently. +set(python_STRING_INDICES +"01" +"02" +"03" +"04" +"05" +"06" +"07" +"08" +"09" +"10" +"11" +"12" +"13" +"15" +"16" +"18" +"19" +"20" +"21" +"22" +"23" +"24" +"25" +"26" +"27" +"28" +"29" +"30" +) + +set(python_SCRIPTS) +# Add some additional installed module files to list of what is normally +# copied to examples/python in the build tree. +set(python_DATA plplot_py_demos.py plplot_python_start.py) +foreach(STRING_INDEX ${python_STRING_INDICES}) + set(python_SCRIPTS ${python_SCRIPTS} x${STRING_INDEX}) + set(python_DATA ${python_DATA} xw${STRING_INDEX}.py) +endforeach(STRING_INDEX ${python_STRING_INDICES}) + +# This list contains standalone scripts which are executable and which +# should be copied to the installed examples build directory. +set( +python_SCRIPTS +${python_SCRIPTS} +pythondemos.py +x14 +x17 +x31 +prova.py +xw14.py +xw17.py +xw31.py +plplot_logo.py +test_circle.py +) + +if(ENABLE_pygcw) + set( + python_SCRIPTS + ${python_SCRIPTS} + plplotcanvas_demo.py + plplotcanvas_animation.py + ) +endif(ENABLE_pygcw) + +# This list contains python modules which are not executable on their own and +# data files that should be copied to the installed examples build tree. + +set( +python_DATA +${python_DATA} +README.pythondemos +README.logo +svg_760x120_gradient.patch +qplplot.py +) + +if(ENABLE_pygcw) + set( + python_DATA + ${python_DATA} + README.plplotcanvas + ) +endif(ENABLE_pygcw) + +if(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + # equivalent to install commands but at "make" time rather than + # "make install" time, to the build tree if different than the source + # tree. + set(command_depends) + foreach(file ${python_SCRIPTS} ${python_DATA}) + set( + command_DEPENDS + ${command_DEPENDS} + ${CMAKE_CURRENT_BINARY_DIR}/${file} + ) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${file} + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file} + ) + endforeach(file ${python_SCRIPTS} ${python_DATA}) + add_custom_target(python_examples ALL DEPENDS ${command_DEPENDS}) + set_property(GLOBAL APPEND PROPERTY TARGETS_examples_python python_examples) +endif(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + Property changes on: trunk/examples/python/CMakeLists.txt_installed_examples_python ___________________________________________________________________ Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-23 21:20:37
|
Revision: 9995 http://plplot.svn.sourceforge.net/plplot/?rev=9995&view=rev Author: airwin Date: 2009-05-23 21:20:13 +0000 (Sat, 23 May 2009) Log Message: ----------- Add test of octave examples to new CMake-based build system for the installed examples tree. Modified Paths: -------------- trunk/examples/CMakeLists.txt_installed_examples trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/CMakeLists.txt_installed_examples =================================================================== --- trunk/examples/CMakeLists.txt_installed_examples 2009-05-23 20:22:17 UTC (rev 9994) +++ trunk/examples/CMakeLists.txt_installed_examples 2009-05-23 21:20:13 UTC (rev 9995) @@ -45,6 +45,12 @@ list(APPEND language_info_LIST cxx:cxx) endif(ENABLE_cxx) +if(ENABLE_d) + add_subdirectory(d) + get_property(targets_examples_d GLOBAL PROPERTY TARGETS_examples_d) + list(APPEND language_info_LIST d:d) +endif(ENABLE_d) + if(ENABLE_f77) add_subdirectory(f77) get_property(targets_examples_f77 GLOBAL PROPERTY TARGETS_examples_f77) @@ -57,12 +63,6 @@ list(APPEND language_info_LIST f95:f95) endif(ENABLE_f95) -if(ENABLE_d) - add_subdirectory(d) - get_property(targets_examples_d GLOBAL PROPERTY TARGETS_examples_d) - list(APPEND language_info_LIST d:d) -endif(ENABLE_d) - if(ENABLE_java) add_subdirectory(java) get_property(targets_examples_java GLOBAL PROPERTY TARGETS_examples_java) @@ -81,18 +81,8 @@ list(APPEND language_info_LIST ocaml:ocaml) endif(ENABLE_ocaml) -if(ENABLE_pdl) - list(APPEND language_info_LIST perl:pdl) -endif(ENABLE_pdl) - -if(ENABLE_python) - add_subdirectory(python) - get_property(targets_examples_python GLOBAL PROPERTY TARGETS_examples_python) - list(APPEND language_info_LIST python:p) -endif(ENABLE_python) - -# Octave not configured yet so the following stanza ignored for now. if(ENABLE_octave) + list(APPEND language_info_LIST octave:o) add_subdirectory(octave) execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different @@ -106,6 +96,16 @@ ) endif(ENABLE_octave) +if(ENABLE_pdl) + list(APPEND language_info_LIST perl:pdl) +endif(ENABLE_pdl) + +if(ENABLE_python) + add_subdirectory(python) + get_property(targets_examples_python GLOBAL PROPERTY TARGETS_examples_python) + list(APPEND language_info_LIST python:p) +endif(ENABLE_python) + execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/lena.pgm Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-23 20:22:17 UTC (rev 9994) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-23 21:20:13 UTC (rev 9995) @@ -13,6 +13,7 @@ set(ENABLE_java @ENABLE_java@) set(ENABLE_lua @ENABLE_lua@) set(ENABLE_ocaml @ENABLE_ocaml@) +set(ENABLE_octave @ENABLE_octave@) set(ENABLE_pdl @ENABLE_pdl@) set(ENABLE_python @ENABLE_python@) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-23 21:40:33
|
Revision: 9996 http://plplot.svn.sourceforge.net/plplot/?rev=9996&view=rev Author: airwin Date: 2009-05-23 21:40:27 +0000 (Sat, 23 May 2009) Log Message: ----------- Add test of tcl examples to new CMake-based build system for the installed examples tree. Modified Paths: -------------- trunk/examples/CMakeLists.txt_installed_examples trunk/examples/plplot_configure.cmake_installed_examples.in trunk/examples/tcl/CMakeLists.txt Added Paths: ----------- trunk/examples/tcl/CMakeLists.txt_installed_examples_tcl Modified: trunk/examples/CMakeLists.txt_installed_examples =================================================================== --- trunk/examples/CMakeLists.txt_installed_examples 2009-05-23 21:20:13 UTC (rev 9995) +++ trunk/examples/CMakeLists.txt_installed_examples 2009-05-23 21:40:27 UTC (rev 9996) @@ -106,6 +106,12 @@ list(APPEND language_info_LIST python:p) endif(ENABLE_python) +if(ENABLE_tcl) + add_subdirectory(tcl) + get_property(targets_examples_tcl GLOBAL PROPERTY TARGETS_examples_tcl) + list(APPEND language_info_LIST tcl:t) +endif(ENABLE_tcl) + execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/lena.pgm Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-23 21:20:13 UTC (rev 9995) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-23 21:40:27 UTC (rev 9996) @@ -16,6 +16,7 @@ set(ENABLE_octave @ENABLE_octave@) set(ENABLE_pdl @ENABLE_pdl@) set(ENABLE_python @ENABLE_python@) +set(ENABLE_tcl @ENABLE_tcl@) # Always enable C language. enable_language(C) @@ -59,3 +60,9 @@ set(ENABLE_pygcw @ENABLE_pygcw@) endif(ENABLE_python) +if(ENABLE_tcl) + set(TCL_TCLSH @TCL_TCLSH@) + set(MKTCLINDEX @MKTCLINDEX@) + set(MKTCLINDEX_ARGS @MKTCLINDEX_ARGS@) +endif(ENABLE_tcl) + Modified: trunk/examples/tcl/CMakeLists.txt =================================================================== --- trunk/examples/tcl/CMakeLists.txt 2009-05-23 21:20:13 UTC (rev 9995) +++ trunk/examples/tcl/CMakeLists.txt 2009-05-23 21:40:27 UTC (rev 9996) @@ -119,3 +119,9 @@ if(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") add_dependencies(tclIndex_examples_tcl tcl_examples) endif(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + +install(FILES CMakeLists.txt_installed_examples_tcl + DESTINATION ${DATA_DIR}/examples/tcl + RENAME CMakeLists.txt + ) + Added: trunk/examples/tcl/CMakeLists.txt_installed_examples_tcl =================================================================== --- trunk/examples/tcl/CMakeLists.txt_installed_examples_tcl (rev 0) +++ trunk/examples/tcl/CMakeLists.txt_installed_examples_tcl 2009-05-23 21:40:27 UTC (rev 9996) @@ -0,0 +1,114 @@ +# tcl/CMakeLists.txt for installed PLplot examples +### Process this file with cmake to produce Makefile +### +# Copyright (C) 2009 Alan W. Irwin +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; version 2 of the License. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +set(tcl_FILES +README.tcldemos +plgrid.tcl +plot.dat +plot.tcl +r.dat +stats.log +tcldemos.tcl +) + +set(tcl_STRING_INDICES +"01" +"02" +"03" +"04" +"05" +"06" +"07" +"08" +"09" +"10" +"11" +"12" +"13" +"14" +"15" +"16" +"17" +"18" +"19" +"20" +"21" +"22" +"23" +"24" +"25" +"26" +"27" +"28" +"29" +"30" +"31" +) + +set(tcl_SCRIPTS) +foreach(STRING_INDEX ${tcl_STRING_INDICES}) + set(tcl_FILES ${tcl_FILES} x${STRING_INDEX}.tcl) + set(tcl_SCRIPTS ${tcl_SCRIPTS} x${STRING_INDEX}) +endforeach(STRING_INDEX ${tcl_STRING_INDICES}) + +# Copy file and scripts to the binary directory if different to the +# source directory. Needed because the tclIndex file +# is generated in the binary tree not the source tree. +if(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + set(tclIndex_WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + set(tclIndex_DEPENDS) + foreach(file ${tcl_SCRIPTS} ${tcl_FILES}) + set( + tclIndex_DEPENDS + ${tclIndex_DEPENDS} + ${CMAKE_CURRENT_BINARY_DIR}/${file} + ) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${file} + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file} + ) + endforeach(file ${tcl_SCRIPTS} ${tcl_FILES}) + add_custom_target(tcl_examples ALL DEPENDS ${tclIndex_DEPENDS}) +else(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + set(tclIndex_DEPENDS ${tcl_FILES} ${tcl_SCRIPTS}) + set(tclIndex_WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) +endif(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + +add_custom_command( +OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tclIndex +COMMAND ${TCL_TCLSH} ${MKTCLINDEX} ${MKTCLINDEX_ARGS} +DEPENDS ${tclIndex_DEPENDS} +WORKING_DIRECTORY ${tclIndex_WORKING_DIRECTORY} +) + +add_custom_target(tclIndex_examples_tcl ALL + DEPENDS ${tclIndex_DEPENDS} ${CMAKE_CURRENT_BINARY_DIR}/tclIndex +) +set_property(GLOBAL APPEND PROPERTY TARGETS_examples_tcl tclIndex_examples_tcl) + +# Workaround CMake 2-level make recursion issue where independent +# file dependency chains that refer to the same files must have +# target dependencies between them in order to work for parallel +# builds (and possibly some visual studio builds). +if(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + add_dependencies(tclIndex_examples_tcl tcl_examples) +endif(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") Property changes on: trunk/examples/tcl/CMakeLists.txt_installed_examples_tcl ___________________________________________________________________ Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-24 04:00:22
|
Revision: 10000 http://plplot.svn.sourceforge.net/plplot/?rev=10000&view=rev Author: airwin Date: 2009-05-24 03:59:57 +0000 (Sun, 24 May 2009) Log Message: ----------- Complete test_noninteractive target by generating file results for every non-interactive device that is enabled and also supported by plplot-test.sh. Modified Paths: -------------- trunk/examples/CMakeLists.txt_installed_examples trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/CMakeLists.txt_installed_examples =================================================================== --- trunk/examples/CMakeLists.txt_installed_examples 2009-05-24 01:00:13 UTC (rev 9999) +++ trunk/examples/CMakeLists.txt_installed_examples 2009-05-24 03:59:57 UTC (rev 10000) @@ -146,8 +146,23 @@ DEPENDS ${output_LIST} ) +set(output_LIST) +foreach(device ${noninteractive_devices_LIST}) + if(PLD_${device}) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/x01c.${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} + DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh + ) + list(APPEND output_LIST ${CMAKE_CURRENT_BINARY_DIR}/x01c.${device}) + endif(PLD_${device}) +endforeach(device ${noninteractive_devices_LIST}) + add_custom_target(test_noninteractive -DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/compare) + DEPENDS ${output_LIST} ${CMAKE_CURRENT_BINARY_DIR}/compare + ) add_dependencies(test_noninteractive ${targets_LIST}) if(ENABLE_tk) Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-24 01:00:13 UTC (rev 9999) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-24 03:59:57 UTC (rev 10000) @@ -73,3 +73,82 @@ set(TK_INCLUDE_PATH @TK_INCLUDE_PATH@) endif(ENABLE_tk) +# Exclude psc since that already has been used for comparisons above. +# Exclude some other devices (linuxvga, conex?) in plplot-test.sh where it is +# unlikely they are interactive. +set(noninteractive_devices_LIST + pdfcairo + pngcairo + pscairo + svgcairo + cgm + dg300 + epsqt + pdfqt + bmpqt + jpgqt + pngqt + ppmqt + tiffqt + svgqt + gif + jpeg + png +# All hp7xxx devices are semi-broken (Invalid pen selection warnings) +# hp7470 +# hp7580 +# lj_hpgl is severely broken (segfaults). +# lj_hpgl + imp + ljii + ljiip +# pbm is severely broken (glibc double free detected) +# pbm + pdf + ps + pstex + psttf + psttfc + svg + tek4010f + tek4107f + wxpng + xfig + ) + +# These are taken from the above list. +set(PLD_pdfcairo @PLD_pdfcairo@) +set(PLD_pngcairo @PLD_pngcairo@) +set(PLD_pscairo @PLD_pscairo@) +set(PLD_svgcairo @PLD_svgcairo@) +set(PLD_cgm @PLD_cgm@) +set(PLD_dg300 @PLD_dg300@) +set(PLD_epsqt @PLD_epsqt@) +set(PLD_pdfqt @PLD_pdfqt@) +set(PLD_bmpqt @PLD_bmpqt@) +set(PLD_jpgqt @PLD_jpgqt@) +set(PLD_pngqt @PLD_pngqt@) +set(PLD_ppmqt @PLD_ppmqt@) +set(PLD_tiffqt @PLD_tiffqt@) +set(PLD_svgqt @PLD_svgqt@) +set(PLD_gif @PLD_gif@) +set(PLD_jpeg @PLD_jpeg@) +set(PLD_png @PLD_png@) +set(PLD_hp7470 @PLD_hp7470@) +set(PLD_hp7580 @PLD_hp7580@) +set(PLD_lj_hpgl @PLD_lj_hpgl@) +set(PLD_imp @PLD_imp@) +set(PLD_ljii @PLD_ljii@) +set(PLD_ljiip @PLD_ljiip@) +set(PLD_pbm @PLD_pbm@) +set(PLD_pdf @PLD_pdf@) +set(PLD_ps @PLD_ps@) +set(PLD_pstex @PLD_pstex@) +set(PLD_psttf @PLD_psttf@) +# PLD_psttfc is a special case which must be set to PLD_psttf. +set(PLD_psttfc @PLD_psttf@) +set(PLD_svg @PLD_svg@) +set(PLD_tek4010f @PLD_tek4010f@) +set(PLD_tek4107f @PLD_tek4107f@) +set(PLD_wxpng @PLD_wxpng@) +set(PLD_xfig @PLD_xfig@) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-29 19:25:56
|
Revision: 10011 http://plplot.svn.sourceforge.net/plplot/?rev=10011&view=rev Author: airwin Date: 2009-05-29 19:25:48 +0000 (Fri, 29 May 2009) Log Message: ----------- pkg-config support for use by the new CMake-based build system for the installed examples tree. Modified Paths: -------------- trunk/examples/CMakeLists.txt trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-05-29 19:23:29 UTC (rev 10010) +++ trunk/examples/CMakeLists.txt 2009-05-29 19:25:48 UTC (rev 10011) @@ -278,6 +278,13 @@ RENAME plplot_configure.cmake ) +# pkg-config support for CMake-based build system for installed examples. +install(FILES + ${CMAKE_SOURCE_DIR}/cmake/modules/pkg-config.cmake + ${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. Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-29 19:23:29 UTC (rev 10010) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-29 19:25:48 UTC (rev 10011) @@ -1,5 +1,12 @@ # This file used to configure CMake variables that are used to build the # installed examples. + +# ======================================================================= +# pkg-config support as well as macros to put link flags in standard +# *.pc (pkg-config) form as well as standard fullpath form used by cmake. +# ======================================================================= +include(pkg-config) + set(LIB_TAG "@LIB_TAG@") set(INCLUDE_DIR @INCLUDE_DIR@) set(MATH_LIB @MATH_LIB@) @@ -18,6 +25,7 @@ set(ENABLE_python @ENABLE_python@) set(ENABLE_tcl @ENABLE_tcl@) set(ENABLE_tk @ENABLE_tk@) +set(ENABLE_gnome2 @ENABLE_gnome2@) # Always enable C language. enable_language(C) @@ -73,6 +81,14 @@ set(TK_INCLUDE_PATH @TK_INCLUDE_PATH@) endif(ENABLE_tk) +# Some example builds depend on pkg-config +if(NOT PKG_CONFIG_EXECUTABLE) + message(STATUS + "WARNING: pkg-config not found. Setting ENABLE_GNOME2 to OFF." + ) + set(ENABLE_gnome2 OFF) +endif(NOT PKG_CONFIG_EXECUTABLE) + # Exclude psc since that already has been used for comparisons above. # Exclude some other devices (linuxvga, conex?) in plplot-test.sh where it is # unlikely they are interactive. @@ -152,3 +168,4 @@ set(PLD_tek4107f @PLD_tek4107f@) set(PLD_wxpng @PLD_wxpng@) set(PLD_xfig @PLD_xfig@) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-30 16:19:02
|
Revision: 10015 http://plplot.svn.sourceforge.net/plplot/?rev=10015&view=rev Author: airwin Date: 2009-05-30 16:18:58 +0000 (Sat, 30 May 2009) Log Message: ----------- Improve pkg-config logic/warning message for CMake-based build system for installed examples. Modified Paths: -------------- trunk/examples/c/CMakeLists.txt_installed_examples_c trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/c/CMakeLists.txt_installed_examples_c =================================================================== --- trunk/examples/c/CMakeLists.txt_installed_examples_c 2009-05-29 20:06:53 UTC (rev 10014) +++ trunk/examples/c/CMakeLists.txt_installed_examples_c 2009-05-30 16:18:58 UTC (rev 10015) @@ -1,3 +1,4 @@ +# -*- mode: cmake -*- # c/CMakeLists.txt for installed PLplot examples ### ### Process this file with cmake to produce Makefile @@ -61,50 +62,54 @@ set_property(GLOBAL APPEND PROPERTY TARGETS_examples_c x${STRING_INDEX}c) endforeach(STRING_INDEX ${c_STRING_INDICES}) -if(ENABLE_gnome2) - # plplotcanvas_demo.c and plplotcanvas_animation.c both - # contain "#include <gtk/gtk.h>" which occurs in the - # /usr/include/gtk-2.0 directory. They also contain - # "#include <plplotcanvas.h>". These issues are both taken care of - # by the libgnomeprintui-2.2 pkg-config module. - pkg_check_pkgconfig(libgnomeprintui-2.2 includedir libdir linkflags1 cflags1 version1 _GNOMEPRINTUI) - if(linkflags1) - # Requires blank-delimited list. - string(REGEX REPLACE ";" " " GNOMEPRINTUI_COMPILE_FLAGS "${cflags1}") - set(GNOMEPRINTUI_LINK_FLAGS "${linkflags1}") - else(linkflags1) - message(STATUS "WARNING: libgnomeprintui-2.2 not found. plplotcanvas_demo and plplotcanvas_animation not built.") - set(ENABLE_gnome2 OFF) - endif(linkflags1) +if(PKG_CONFIG_EXECUTABLE) + if(ENABLE_gnome2) + # plplotcanvas_demo.c and plplotcanvas_animation.c both + # contain "#include <gtk/gtk.h>" which occurs in the + # /usr/include/gtk-2.0 directory. They also contain + # "#include <plplotcanvas.h>". These issues are both taken care of + # by the libgnomeprintui-2.2 pkg-config module. + pkg_check_pkgconfig(libgnomeprintui-2.2 includedir libdir linkflags1 cflags1 version1 _GNOMEPRINTUI) + if(linkflags1) + # Requires blank-delimited list. + string(REGEX REPLACE ";" " " GNOMEPRINTUI_COMPILE_FLAGS "${cflags1}") + set(GNOMEPRINTUI_LINK_FLAGS "${linkflags1}") + else(linkflags1) + message(STATUS "WARNING: libgnomeprintui-2.2 not found. plplotcanvas_demo and plplotcanvas_animation not built.") + set(ENABLE_gnome2 OFF) + endif(linkflags1) - # plplotcanvas_animation.c contains a reference to gthread_init and also - # contains '#include <glib.h>'. Analysis shows both these issues are - # taken care of by the gthread-2.0 pkg-config module. - pkg_check_pkgconfig(gthread-2.0 includedir libdir linkflags2 cflags2 version2 _GTHREAD_2.0) - if(linkflags2) - # Requires blank-delimited list. - string(REGEX REPLACE ";" " " GTHREAD_2.0_COMPILE_FLAGS "${cflags2}") - set(GTHREAD_2.0_LINK_FLAGS "${linkflags2}") - set(ENABLE_plplotcanvas_animation ON) - else(linkflags2) - message(STATUS "WARNING: gthread-2.0 not found. plplotcanvas_animation not built") - set(ENABLE_plplotcanvas_animation OFF) - endif(linkflags2) -endif(ENABLE_gnome2) - -if(ENABLE_gnome2) - set_source_files_properties( - plplotcanvas_demo.c - PROPERTIES COMPILE_FLAGS "${GNOMEPRINTUI_COMPILE_FLAGS}" - ) - add_executable(plplotcanvas_demo plplotcanvas_demo.c) - target_link_libraries(plplotcanvas_demo ${GNOMEPRINTUI_LINK_FLAGS} plplotgnome2${LIB_TAG}) - if(ENABLE_plplotcanvas_animation) + # plplotcanvas_animation.c contains a reference to gthread_init and also + # contains '#include <glib.h>'. Analysis shows both these issues are + # taken care of by the gthread-2.0 pkg-config module. + pkg_check_pkgconfig(gthread-2.0 includedir libdir linkflags2 cflags2 version2 _GTHREAD_2.0) + if(linkflags2) + # Requires blank-delimited list. + string(REGEX REPLACE ";" " " GTHREAD_2.0_COMPILE_FLAGS "${cflags2}") + set(GTHREAD_2.0_LINK_FLAGS "${linkflags2}") + set(ENABLE_plplotcanvas_animation ON) + else(linkflags2) + message(STATUS "WARNING: gthread-2.0 not found. plplotcanvas_animation not built") + set(ENABLE_plplotcanvas_animation OFF) + endif(linkflags2) + endif(ENABLE_gnome2) + + if(ENABLE_gnome2) set_source_files_properties( - plplotcanvas_animation.c - PROPERTIES COMPILE_FLAGS "${GNOMEPRINTUI_COMPILE_FLAGS} ${GTHREAD_2.0_COMPILE_FLAGS}" + plplotcanvas_demo.c + PROPERTIES COMPILE_FLAGS "${GNOMEPRINTUI_COMPILE_FLAGS}" ) - add_executable(plplotcanvas_animation plplotcanvas_animation.c) - target_link_libraries(plplotcanvas_animation ${GNOMEPRINTUI_LINK_FLAGS} ${GTHREAD_2.0_LINK_FLAGS} plplotgnome2${LIB_TAG}) - endif(ENABLE_plplotcanvas_animation) -endif(ENABLE_gnome2) + add_executable(plplotcanvas_demo plplotcanvas_demo.c) + target_link_libraries(plplotcanvas_demo ${GNOMEPRINTUI_LINK_FLAGS} plplotgnome2${LIB_TAG}) + if(ENABLE_plplotcanvas_animation) + set_source_files_properties( + plplotcanvas_animation.c + PROPERTIES COMPILE_FLAGS "${GNOMEPRINTUI_COMPILE_FLAGS} ${GTHREAD_2.0_COMPILE_FLAGS}" + ) + add_executable(plplotcanvas_animation plplotcanvas_animation.c) + target_link_libraries(plplotcanvas_animation ${GNOMEPRINTUI_LINK_FLAGS} ${GTHREAD_2.0_LINK_FLAGS} plplotgnome2${LIB_TAG}) + endif(ENABLE_plplotcanvas_animation) + endif(ENABLE_gnome2) +else(PKG_CONFIG_EXECUTABLE) + message(STATUS "WARNING: pkg-config not found so plplotcanvas_demo and plplotcanvas_animation not built.") +endif(PKG_CONFIG_EXECUTABLE) Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-29 20:06:53 UTC (rev 10014) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-30 16:18:58 UTC (rev 10015) @@ -1,3 +1,4 @@ +# -*- mode: cmake -*- # This file used to configure CMake variables that are used to build the # installed examples. @@ -4,6 +5,8 @@ # ======================================================================= # pkg-config support as well as macros to put link flags in standard # *.pc (pkg-config) form as well as standard fullpath form used by cmake. +# PKG_CONFIG_EXECUTABLE can be used to discover whether pkg-config was +# found or not. # ======================================================================= include(pkg-config) @@ -81,14 +84,6 @@ set(TK_INCLUDE_PATH @TK_INCLUDE_PATH@) endif(ENABLE_tk) -# Some example builds depend on pkg-config -if(NOT PKG_CONFIG_EXECUTABLE) - message(STATUS - "WARNING: pkg-config not found. Setting ENABLE_GNOME2 to OFF." - ) - set(ENABLE_gnome2 OFF) -endif(NOT PKG_CONFIG_EXECUTABLE) - # Exclude psc since that already has been used for comparisons above. # Exclude some other devices (linuxvga, conex?) in plplot-test.sh where it is # unlikely they are interactive. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-30 16:39:49
|
Revision: 10016 http://plplot.svn.sourceforge.net/plplot/?rev=10016&view=rev Author: airwin Date: 2009-05-30 16:39:47 +0000 (Sat, 30 May 2009) Log Message: ----------- Build extXdrawable_demo with new CMake-based build system for installed examples. Modified Paths: -------------- trunk/examples/c/CMakeLists.txt_installed_examples_c trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/c/CMakeLists.txt_installed_examples_c =================================================================== --- trunk/examples/c/CMakeLists.txt_installed_examples_c 2009-05-30 16:18:58 UTC (rev 10015) +++ trunk/examples/c/CMakeLists.txt_installed_examples_c 2009-05-30 16:39:47 UTC (rev 10016) @@ -110,6 +110,22 @@ target_link_libraries(plplotcanvas_animation ${GNOMEPRINTUI_LINK_FLAGS} ${GTHREAD_2.0_LINK_FLAGS} plplotgnome2${LIB_TAG}) endif(ENABLE_plplotcanvas_animation) endif(ENABLE_gnome2) + if(PLD_xcairo) + pkg_check_pkgconfig(gtk+-x11-2.0 includedir libdir linkflags3 cflags3 version1 _GTK_X11) + if(linkflags3) + # Requires blank-delimited list. + string(REGEX REPLACE ";" " " GTK_X11_COMPILE_FLAGS "${cflags3}") + set(GTK_X11_LINK_FLAGS "${linkflags3}") + set_source_files_properties( + extXdrawable_demo.c + PROPERTIES COMPILE_FLAGS "${GTK_X11_COMPILE_FLAGS}" + ) + add_executable(extXdrawable_demo extXdrawable_demo.c) + target_link_libraries(extXdrawable_demo ${GTK_X11_LINK_FLAGS} plplot${LIB_TAG}) + else(linkflags3) + message(STATUS "WARNING: gtk+-x11-2.0 not found. extXdrawable_demo not built.") + endif(linkflags3) + endif(PLD_xcairo) else(PKG_CONFIG_EXECUTABLE) message(STATUS "WARNING: pkg-config not found so plplotcanvas_demo and plplotcanvas_animation not built.") endif(PKG_CONFIG_EXECUTABLE) Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-30 16:18:58 UTC (rev 10015) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-05-30 16:39:47 UTC (rev 10016) @@ -164,3 +164,5 @@ set(PLD_wxpng @PLD_wxpng@) set(PLD_xfig @PLD_xfig@) +# Set interactive devices +set(PLD_xcairo @PLD_xcairo@) \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-06-23 17:38:18
|
Revision: 10067 http://plplot.svn.sourceforge.net/plplot/?rev=10067&view=rev Author: airwin Date: 2009-06-23 17:38:17 +0000 (Tue, 23 Jun 2009) Log Message: ----------- Use new plplotqt library to build qt_example. Modified Paths: -------------- trunk/examples/c++/CMakeLists.txt_installed_examples_cxx trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/c++/CMakeLists.txt_installed_examples_cxx =================================================================== --- trunk/examples/c++/CMakeLists.txt_installed_examples_cxx 2009-06-23 00:56:47 UTC (rev 10066) +++ trunk/examples/c++/CMakeLists.txt_installed_examples_cxx 2009-06-23 17:38:17 UTC (rev 10067) @@ -72,7 +72,7 @@ target_link_libraries(wxPLplotDemo ${wxwidgets_LINK_FLAGS} plplotwxwidgets${LIB_TAG}) endif(ENABLE_wxwidgets) -if(PLD_extqt AND TARGET qt) +if(ENABLE_qt) # Must find Qt4 all over again here rather than simply copying variables # from the core build to this installed examples build so that we can # access the qt4_wrap_cpp macro here. @@ -96,11 +96,8 @@ PROPERTIES GENERATED "ON" ) add_executable(qt_example qt_example.cpp qt_PlotWindow.cpp ${QT_MOC_OUTFILES}) - # Use file location + plplot${LIB_TAG} rather than the "qt" target - # because otherwise rpath is not set properly for the qt module. - get_target_property(qt_LOCATION qt IMPORTED_LOCATION_NOCONFIG) - target_link_libraries(qt_example ${QT_LIBRARIES} ${qt_LOCATION} plplot${LIB_TAG}) + target_link_libraries(qt_example ${QT_LIBRARIES} plplotqt${LIB_TAG} plplot${LIB_TAG}) else(QT4_FOUND AND QT_VERSION_MAJOR STREQUAL "${CORE_QT_VERSION_MAJOR}" AND QT_VERSION_MINOR STREQUAL "${CORE_QT_VERSION_MINOR}" AND QT_VERSION_PATCH STREQUAL "${CORE_QT_VERSION_PATCH}") message(STATUS "WARNING: Qt4 not found or wrong version. qt_example not built") endif(QT4_FOUND AND QT_VERSION_MAJOR STREQUAL "${CORE_QT_VERSION_MAJOR}" AND QT_VERSION_MINOR STREQUAL "${CORE_QT_VERSION_MINOR}" AND QT_VERSION_PATCH STREQUAL "${CORE_QT_VERSION_PATCH}") -endif(PLD_extqt AND TARGET qt) +endif(ENABLE_qt) Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-06-23 00:56:47 UTC (rev 10066) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-06-23 17:38:17 UTC (rev 10067) @@ -30,6 +30,7 @@ set(ENABLE_tk @ENABLE_tk@) set(ENABLE_gnome2 @ENABLE_gnome2@) set(ENABLE_wxwidgets @ENABLE_wxwidgets@) +set(ENABLE_qt @ENABLE_qt@) # Always enable C language. enable_language(C) @@ -94,13 +95,12 @@ # Set interactive/external devices that are needed to build certain examples. set(PLD_xcairo @PLD_xcairo@) set(PLD_extcairo @PLD_extcairo@) -set(PLD_extqt @PLD_extqt@) -if(PLD_extqt) +if(ENABLE_qt) set(CORE_QT_VERSION_MAJOR @QT_VERSION_MAJOR@) set(CORE_QT_VERSION_MINOR @QT_VERSION_MINOR@) set(CORE_QT_VERSION_PATCH @QT_VERSION_PATCH@) -endif(PLD_extqt) +endif(ENABLE_qt) # List of all devices that will be used for non_interactive tests. # Exclude psc since that already has been used for comparisons above. @@ -182,4 +182,3 @@ set(PLD_tek4107f @PLD_tek4107f@) set(PLD_wxpng @PLD_wxpng@) set(PLD_xfig @PLD_xfig@) - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |