[Plplot-cvs] SF.net SVN: plplot:[10089]
trunk/examples/plplot_configure. cmake_installed_examples.in
From: <ai...@us...> - 2009-06-28 08:52:43
|
Revision: 10089 http://plplot.svn.sourceforge.net/plplot/?rev=10089&view=rev Author: airwin Date: 2009-06-28 08:52:12 +0000 (Sun, 28 Jun 2009) Log Message: ----------- Indentation fixup. if PLD_whatever or ENABLE_whatever core build system values are OFF, then change from option to forced cache value of OFF. This keeps the user from turning an option ON that cannot be ON because the core value is OFF. Modified Paths: -------------- trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-06-28 08:46:58 UTC (rev 10088) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-06-28 08:52:12 UTC (rev 10089) @@ -35,7 +35,7 @@ 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 @@ -84,199 +84,208 @@ # 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(CORE_ENABLE_${language}) + if(NOT PRESET_DEFAULT) + set(DEFAULT ${CORE_ENABLE_${language}}) + endif(NOT PRESET_DEFAULT) + option(ENABLE_${language} "Enable ${language} bindings" ${DEFAULT}) + else(CORE_ENABLE_${language}) + set(ENABLE_${language} OFF CACHE BOOL "Enable ${language} bindings" FORCE) + endif(CORE_ENABLE_${language}) + endif(language STREQUAL "c") + endforeach(language_info ${language_info_LIST}) -if(ENABLE_c) - enable_language(C) -endif(ENABLE_c) + if(ENABLE_c) + enable_language(C) + endif(ENABLE_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_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_cxx) + enable_language(CXX) + endif(ENABLE_cxx) -if(ENABLE_d) - enable_language(D) -endif(ENABLE_d) + 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_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) + if(ENABLE_f95) + 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) + if(ENABLE_java) + enable_language(Java) + find_package(JNI) + 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) + if(ENABLE_ocaml) + set(OCAMLC @OCAMLC@) + 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) + if(ENABLE_python) + set(ENABLE_pygcw @ENABLE_pygcw@) + endif(ENABLE_python) -if(ENABLE_tcl OR ENABLE_tk) - set(TCL_TCLSH @TCL_TCLSH@) - set(MKTCLINDEX @MKTCLINDEX@) - set(MKTCLINDEX_ARGS @MKTCLINDEX_ARGS@) -endif(ENABLE_tcl OR ENABLE_tk) + if(ENABLE_tcl OR ENABLE_tk) + set(TCL_TCLSH @TCL_TCLSH@) + set(MKTCLINDEX @MKTCLINDEX@) + set(MKTCLINDEX_ARGS @MKTCLINDEX_ARGS@) + endif(ENABLE_tcl OR ENABLE_tk) -if(ENABLE_tk) - set(ENABLE_itk @ENABLE_itk@) - set(TCL_INCLUDE_PATH @TCL_INCLUDE_PATH@) - set(TK_INCLUDE_PATH @TK_INCLUDE_PATH@) -endif(ENABLE_tk) + if(ENABLE_tk) + set(ENABLE_itk @ENABLE_itk@) + set(TCL_INCLUDE_PATH @TCL_INCLUDE_PATH@) + set(TK_INCLUDE_PATH @TK_INCLUDE_PATH@) + endif(ENABLE_tk) -if(ENABLE_wxwidgets) - # Use identical compile and link flags to build wxwidgets application. - set(wxwidgets_COMPILE_FLAGS "@wxwidgets_COMPILE_FLAGS@") - set(wxwidgets_LINK_FLAGS @wxwidgets_LINK_FLAGS@) -endif(ENABLE_wxwidgets) + if(ENABLE_wxwidgets) + # Use identical compile and link flags to build wxwidgets application. + set(wxwidgets_COMPILE_FLAGS "@wxwidgets_COMPILE_FLAGS@") + set(wxwidgets_LINK_FLAGS @wxwidgets_LINK_FLAGS@) + endif(ENABLE_wxwidgets) -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) + 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 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:OFF -# hp7580:OFF -# lj_hpgl is severely broken (segfaults). -# lj_hpgl:OFF - imp:OFF - ljii:OFF - ljiip:OFF -# pbm is severely broken (glibc double free detected) -# 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 - ) + # 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:OFF + # hp7580:OFF + # lj_hpgl is severely broken (segfaults). + # lj_hpgl:OFF + imp:OFF + ljii:OFF + ljiip:OFF + # pbm is severely broken (glibc double free detected) + # 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 + ) -# 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@) + # 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@) + # 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@) + # 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 - ) + 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) + 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 + # 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}) + foreach(noninteractive_devices_info psc:? xcairo:? extcairo:? ${noninteractive_devices_info_LIST}) + string(REGEX REPLACE "^(.*):.*$" "\\1" DEVICE ${noninteractive_devices_info}) + #message("DEBUG: DEVICE = ${DEVICE}") + if(CORE_PLD_${DEVICE}) + if(NOT PRESET_DEFAULT) + set(DEFAULT ${CORE_PLD_${DEVICE}}) + endif(NOT PRESET_DEFAULT) + option(PLD_${DEVICE} "Enable ${DEVICE} device" ${DEFAULT}) + else(CORE_PLD_${DEVICE}) + set(PLD_${DEVICE} OFF CACHE BOOL "Enable ${device} device" FORCE) + endif(CORE_PLD_${DEVICE}) + + 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. |
[Plplot-cvs] SF.net SVN: plplot:[10093]
trunk/examples/plplot_configure. cmake_installed_examples.in
From: <ai...@us...> - 2009-06-28 22:42:15
|
Revision: 10093 http://plplot.svn.sourceforge.net/plplot/?rev=10093&view=rev Author: airwin Date: 2009-06-28 22:42:13 +0000 (Sun, 28 Jun 2009) Log Message: ----------- Fix indentation. Modified Paths: -------------- trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-06-28 22:39:22 UTC (rev 10092) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-06-28 22:42:13 UTC (rev 10093) @@ -92,200 +92,200 @@ else(CORE_ENABLE_${language}) set(ENABLE_${language} OFF CACHE BOOL "Enable ${language} bindings" FORCE) endif(CORE_ENABLE_${language}) - endif(language STREQUAL "c") - endforeach(language_info ${language_info_LIST}) + endif(language STREQUAL "c") +endforeach(language_info ${language_info_LIST}) - if(ENABLE_c) - enable_language(C) - endif(ENABLE_c) +if(ENABLE_c) + enable_language(C) +endif(ENABLE_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_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_cxx) + enable_language(CXX) +endif(ENABLE_cxx) - if(ENABLE_d) - enable_language(D) - endif(ENABLE_d) +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_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) +if(ENABLE_f95) + 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) +if(ENABLE_java) + enable_language(Java) + find_package(JNI) + 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) +if(ENABLE_ocaml) + set(OCAMLC @OCAMLC@) + 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) +if(ENABLE_python) + set(ENABLE_pygcw @ENABLE_pygcw@) +endif(ENABLE_python) - if(ENABLE_tcl OR ENABLE_tk) - set(TCL_TCLSH @TCL_TCLSH@) - set(MKTCLINDEX @MKTCLINDEX@) - set(MKTCLINDEX_ARGS @MKTCLINDEX_ARGS@) - endif(ENABLE_tcl OR ENABLE_tk) +if(ENABLE_tcl OR ENABLE_tk) + set(TCL_TCLSH @TCL_TCLSH@) + set(MKTCLINDEX @MKTCLINDEX@) + set(MKTCLINDEX_ARGS @MKTCLINDEX_ARGS@) +endif(ENABLE_tcl OR ENABLE_tk) - if(ENABLE_tk) - set(ENABLE_itk @ENABLE_itk@) - set(TCL_INCLUDE_PATH @TCL_INCLUDE_PATH@) - set(TK_INCLUDE_PATH @TK_INCLUDE_PATH@) - endif(ENABLE_tk) +if(ENABLE_tk) + set(ENABLE_itk @ENABLE_itk@) + set(TCL_INCLUDE_PATH @TCL_INCLUDE_PATH@) + set(TK_INCLUDE_PATH @TK_INCLUDE_PATH@) +endif(ENABLE_tk) - if(ENABLE_wxwidgets) - # Use identical compile and link flags to build wxwidgets application. - set(wxwidgets_COMPILE_FLAGS "@wxwidgets_COMPILE_FLAGS@") - set(wxwidgets_LINK_FLAGS @wxwidgets_LINK_FLAGS@) - endif(ENABLE_wxwidgets) +if(ENABLE_wxwidgets) + # Use identical compile and link flags to build wxwidgets application. + set(wxwidgets_COMPILE_FLAGS "@wxwidgets_COMPILE_FLAGS@") + set(wxwidgets_LINK_FLAGS @wxwidgets_LINK_FLAGS@) +endif(ENABLE_wxwidgets) - 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) +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 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:OFF - # hp7580:OFF - # lj_hpgl is severely broken (segfaults). - # lj_hpgl:OFF - imp:OFF - ljii:OFF - ljiip:OFF - # pbm is severely broken (glibc double free detected) - # 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 - ) +# 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:OFF + # hp7580:OFF + # lj_hpgl is severely broken (segfaults). + # lj_hpgl:OFF + imp:OFF + ljii:OFF + ljiip:OFF + # pbm is severely broken (glibc double free detected) + # 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 + ) - # 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@) +# 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@) +# 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@) +# 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 - ) +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) +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 +# 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(CORE_PLD_${DEVICE}) - if(NOT PRESET_DEFAULT) - set(DEFAULT ${CORE_PLD_${DEVICE}}) - endif(NOT PRESET_DEFAULT) - option(PLD_${DEVICE} "Enable ${DEVICE} device" ${DEFAULT}) - else(CORE_PLD_${DEVICE}) - set(PLD_${DEVICE} OFF CACHE BOOL "Enable ${device} device" FORCE) - endif(CORE_PLD_${DEVICE}) +foreach(noninteractive_devices_info psc:? xcairo:? extcairo:? ${noninteractive_devices_info_LIST}) + string(REGEX REPLACE "^(.*):.*$" "\\1" DEVICE ${noninteractive_devices_info}) + #message("DEBUG: DEVICE = ${DEVICE}") + if(CORE_PLD_${DEVICE}) + if(NOT PRESET_DEFAULT) + set(DEFAULT ${CORE_PLD_${DEVICE}}) + endif(NOT PRESET_DEFAULT) + option(PLD_${DEVICE} "Enable ${DEVICE} device" ${DEFAULT}) + else(CORE_PLD_${DEVICE}) + set(PLD_${DEVICE} OFF CACHE BOOL "Enable ${device} device" FORCE) + endif(CORE_PLD_${DEVICE}) - endforeach(noninteractive_devices_info psc:OFF xcairo:OFF extcairo:OFF ${noninteractive_devices_info_LIST}) +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. |
[Plplot-cvs] SF.net SVN: plplot:[10095]
trunk/examples/plplot_configure. cmake_installed_examples.in
From: <ai...@us...> - 2009-06-29 20:23:13
|
Revision: 10095 http://plplot.svn.sourceforge.net/plplot/?rev=10095&view=rev Author: airwin Date: 2009-06-29 20:23:11 +0000 (Mon, 29 Jun 2009) Log Message: ----------- For new build system handle ENABLE_c case like others (i.e., with a ENABLE_c cmake option that can be set by the user). Make all enable_language commands OPTIONAL to deal smoothly with the case when a compiler is broken. Modified Paths: -------------- trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-06-29 01:48:32 UTC (rev 10094) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-06-29 20:23:11 UTC (rev 10095) @@ -40,10 +40,9 @@ # 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@) +# N.B. The core never sets ENABLE_c since C is always on for the core. +set(CORE_ENABLE_c ON) set(CORE_ENABLE_cxx @ENABLE_cxx@) set(CORE_ENABLE_d @ENABLE_d@) set(CORE_ENABLE_f77 @ENABLE_f77@) @@ -79,51 +78,79 @@ 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(CORE_ENABLE_${language}) - if(NOT PRESET_DEFAULT) - set(DEFAULT ${CORE_ENABLE_${language}}) - endif(NOT PRESET_DEFAULT) - option(ENABLE_${language} "Enable ${language} bindings" ${DEFAULT}) - else(CORE_ENABLE_${language}) - set(ENABLE_${language} OFF CACHE BOOL "Enable ${language} bindings" FORCE) - endif(CORE_ENABLE_${language}) - endif(language STREQUAL "c") + if(CORE_ENABLE_${language}) + if(NOT PRESET_DEFAULT) + set(DEFAULT ${CORE_ENABLE_${language}}) + endif(NOT PRESET_DEFAULT) + option(ENABLE_${language} "Enable ${language} bindings" ${DEFAULT}) + else(CORE_ENABLE_${language}) + set(ENABLE_${language} OFF CACHE BOOL "Enable ${language} bindings" FORCE) + endif(CORE_ENABLE_${language}) endforeach(language_info ${language_info_LIST}) if(ENABLE_c) - enable_language(C) + enable_language(C OPTIONAL) + if(NOT CMAKE_C_COMPILER_WORKS) + message(STATUS: "WARNING: C compiler does not work so disabling C examples.") + set(ENABLE_c OFF CACHE BOOL "Enable c bindings" FORCE) + endif(NOT CMAKE_C_COMPILER_WORKS) endif(ENABLE_c) if(ENABLE_ada) - enable_language(Ada) + enable_language(Ada OPTIONAL) + if(NOT CMAKE_Ada_COMPILER_WORKS) + message(STATUS: "WARNING: Ada compiler does not work so disabling Ada examples.") + set(ENABLE_ada OFF CACHE BOOL "Enable ada bindings" FORCE) + endif(NOT CMAKE_Ada_COMPILER_WORKS) +endif(ENABLE_ada) + +if(ENABLE_ada) set(ADA_INCLUDE_DIR @ADA_INCLUDE_DIR@) set(ADA_LIB_DIR @ADA_LIB_DIR@) endif(ENABLE_ada) if(ENABLE_cxx) - enable_language(CXX) + enable_language(CXX OPTIONAL) + if(NOT CMAKE_CXX_COMPILER_WORKS) + message(STATUS: "WARNING: C++ compiler does not work so disabling C++ examples.") + set(ENABLE_cxx OFF CACHE BOOL "Enable cxx bindings" FORCE) + endif(NOT CMAKE_CXX_COMPILER_WORKS) endif(ENABLE_cxx) if(ENABLE_d) - enable_language(D) + enable_language(D OPTIONAL) + if(NOT CMAKE_D_COMPILER_WORKS) + message(STATUS: "WARNING: D compiler does not work so disabling D examples.") + set(ENABLE_d OFF CACHE BOOL "Enable d bindings" FORCE) + endif(NOT CMAKE_D_COMPILER_WORKS) endif(ENABLE_d) -if(ENABLE_F77 OR ENABLE_f95) +if(ENABLE_f77 OR ENABLE_f95) set(STATIC_OPTS @STATIC_OPTS@) - enable_language(Fortran) -endif(ENABLE_F77 OR ENABLE_f95) +endif(ENABLE_f77 OR ENABLE_f95) +if(ENABLE_f77 OR ENABLE_f95) + enable_language(Fortran OPTIONAL) + if(NOT CMAKE_Fortran_COMPILER_WORKS) + message(STATUS: "WARNING: Fortran compiler does not work so disabling Fortran examples.") + set(ENABLE_f77 OFF CACHE BOOL "Enable f77 bindings" FORCE) + set(ENABLE_f95 OFF CACHE BOOL "Enable f95 bindings" FORCE) + endif(NOT CMAKE_Fortran_COMPILER_WORKS) +endif(ENABLE_f77 OR ENABLE_f95) + if(ENABLE_f95) set(F95_MOD_DIR @F95_MOD_DIR@) endif(ENABLE_f95) if(ENABLE_java) - enable_language(Java) + enable_language(Java OPTIONAL) + if(NOT CMAKE_Java_COMPILER_WORKS) + message(STATUS: "WARNING: Java compiler does not work so disabling Java examples.") + set(ENABLE_java OFF CACHE BOOL "Enable java bindings" FORCE) + endif(NOT CMAKE_Java_COMPILER_WORKS) +endif(ENABLE_java) + +if(ENABLE_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. |
[Plplot-cvs] SF.net SVN: plplot:[10180]
trunk/examples/plplot_configure. cmake_installed_examples.in
From: <ai...@us...> - 2009-07-26 23:12:32
|
Revision: 10180 http://plplot.svn.sourceforge.net/plplot/?rev=10180&view=rev Author: airwin Date: 2009-07-26 23:12:07 +0000 (Sun, 26 Jul 2009) Log Message: ----------- Identify the build system for the installed examples by setting BUILD_TEST ON and CORE_BUILD OFF. In the core build system the former can be OFF or ON at user option, and the latter is always ON. Modified Paths: -------------- trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-07-26 23:07:32 UTC (rev 10179) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-07-26 23:12:07 UTC (rev 10180) @@ -1,6 +1,9 @@ # -*- mode: cmake -*- # This file used to configure CMake variables that are used to build the # installed examples. +# Identify that this is the build system for the installed examples. +set(BUILD_TEST ON) +set(CORE_BUILD OFF) # ======================================================================= # pkg-config support as well as macros to put link flags in standard This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Plplot-cvs] SF.net SVN: plplot:[10438]
trunk/examples/plplot_configure. cmake_installed_examples.in
From: <ai...@us...> - 2009-09-20 17:59:41
|
Revision: 10438 http://plplot.svn.sourceforge.net/plplot/?rev=10438&view=rev Author: airwin Date: 2009-09-20 17:59:33 +0000 (Sun, 20 Sep 2009) Log Message: ----------- Drop all option commands from the installed examples build. These were previously used to remove some of languages and devices to simplify testing. However, these options now make little sense since we now have a much more convenient way to control what is built and tested at make (or nmake) time using particular test_* targets. Install proper soft-landing support for installed examples build when compilers are missing/broken. Modified Paths: -------------- trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-09-20 17:56:16 UTC (rev 10437) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-09-20 17:59:33 UTC (rev 10438) @@ -25,121 +25,46 @@ # commands must be done on the rare occasions when a language is added # to PLplot. Cannot make the list of set commands automatically with # a foreach loop because explicit configuration of each name is required. -set(CORE_ENABLE_ada @ENABLE_ada@) -# N.B. The core never sets ENABLE_c since C is always on for the core. -set(CORE_ENABLE_c ON) -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@) +set(ENABLE_ada @ENABLE_ada@) +set(ENABLE_c @ENABLE_c@) +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@) # 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@) +set(ENABLE_tk @ENABLE_tk@) +set(ENABLE_gnome2 @ENABLE_gnome2@) +set(ENABLE_wxwidgets @ENABLE_wxwidgets@) +set(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 - ) +# Check for all officially supported CMake compilers that we use with +# soft-landing support. +include(language_support) -if(DEFAULT_NO_BINDINGS) - set(PRESET_DEFAULT ON) - set(DEFAULT OFF) -else(DEFAULT_NO_BINDINGS) - set(PRESET_DEFAULT OFF) -endif(DEFAULT_NO_BINDINGS) +# First field is lower-case language string, second field is +# mixed-case language string used for official CMake variables, third +# field is language string to be used in output messages, and final +# field is whether it is a fatal error if this language is missing/not +# working. +set(COMPILED_LANGUAGE_INFO_LIST +"c:C:C:ON" +"ada:Ada:Ada:OFF" +"cxx:CXX:C++:OFF" +"d:D:D:OFF" +"f77:Fortran:Fortran:OFF" +"f95:Fortran:Fortran:OFF" +"java:Java:Java:OFF" +) -# 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 the build system requires C. - set(ENABLE_${language} ON CACHE BOOL "Enable ${language} bindings" FORCE) - else(language STREQUAL "c") - if(CORE_ENABLE_${language}) - if(NOT PRESET_DEFAULT) - set(DEFAULT ${CORE_ENABLE_${language}}) - endif(NOT PRESET_DEFAULT) - option(ENABLE_${language} "Enable ${language} bindings" ${DEFAULT}) - else(CORE_ENABLE_${language}) - set(ENABLE_${language} OFF CACHE BOOL "Enable ${language} bindings" FORCE) - endif(CORE_ENABLE_${language}) - endif(language STREQUAL "c") -endforeach(language_info ${language_info_LIST}) - -# Always carry out C checks because build system requires a C compiler -# for some of the automatic checking that is done. -set(alwaysc ON) - -# OPTIONAL below currently does not work properly with CMake so attempt -# to deal with a possibly missing compiler first as a workaround. -if(alwaysc OR ENABLE_c) - include(CMakeDetermineCCompiler) - if(NOT CMAKE_C_COMPILER) - # This is a FATAL_ERROR rather than STATUS message because C compiler - # absolutely required for some of the automatic checking that is done. - message(FATAL_ERROR "C compiler absolutely required to build this project.") - message(STATUS "WARNING: C compiler not found so disabling C examples.") - set(ENABLE_c OFF CACHE BOOL "Enable c bindings" FORCE) - endif(NOT CMAKE_C_COMPILER) -endif(alwaysc OR ENABLE_c) - -if(alwaysc OR ENABLE_c) - enable_language(C OPTIONAL) - if(NOT CMAKE_C_COMPILER_WORKS) - # This is a FATAL_ERROR rather than STATUS message because C compiler - # absolutely required for some of the automatic checking that is done. - message(FATAL_ERROR "C compiler absolutely required to build this project.") - message(STATUS "WARNING: C compiler does not work so disabling C examples.") - set(ENABLE_c OFF CACHE BOOL "Enable c bindings" FORCE) - endif(NOT CMAKE_C_COMPILER_WORKS) -endif(alwaysc OR ENABLE_c) - -# OPTIONAL below currently does not work properly with CMake so attempt -# to deal with a possibly missing compiler first as a workaround. -if(ENABLE_ada) - include(CMakeDetermineAdaCompiler) - if(NOT CMAKE_Ada_COMPILER) - message(STATUS "WARNING: Ada compiler not found so disabling Ada examples.") - set(ENABLE_ada OFF CACHE BOOL "Enable ada bindings" FORCE) - endif(NOT CMAKE_Ada_COMPILER) -endif(ENABLE_ada) - -if(ENABLE_ada) - enable_language(Ada OPTIONAL) - if(NOT CMAKE_Ada_COMPILER_WORKS) - message(STATUS "WARNING: Ada compiler does not work so disabling Ada examples.") - set(ENABLE_ada OFF CACHE BOOL "Enable ada bindings" FORCE) - endif(NOT CMAKE_Ada_COMPILER_WORKS) -endif(ENABLE_ada) - -if(ENABLE_ada) - set(ADA_INCLUDE_DIR @ADA_INCLUDE_DIR@) - set(ADA_LIB_DIR @ADA_LIB_DIR@) -endif(ENABLE_ada) - -# OPTIONAL below currently does not work properly with CMake so attempt -# to deal with a possibly missing compiler first as a workaround. if(ENABLE_cxx) - include(CMakeDetermineCXXCompiler) - if(NOT CMAKE_CXX_COMPILER) - message(STATUS "WARNING: C++ compiler not found so disabling C++ examples.") - set(ENABLE_cxx OFF CACHE BOOL "Enable cxx bindings" FORCE) - endif(NOT CMAKE_CXX_COMPILER) -endif(ENABLE_cxx) - -if(ENABLE_cxx) enable_language(CXX OPTIONAL) if(NOT CMAKE_CXX_COMPILER_WORKS) message(STATUS "WARNING: C++ compiler does not work so disabling C++ examples.") @@ -147,17 +72,7 @@ endif(NOT CMAKE_CXX_COMPILER_WORKS) endif(ENABLE_cxx) -# OPTIONAL below currently does not work properly with CMake so attempt -# to deal with a possibly missing compiler first as a workaround. if(ENABLE_d) - include(CMakeDetermineDCompiler) - if(NOT CMAKE_D_COMPILER) - message(STATUS "WARNING: D compiler not found so disabling D examples.") - set(ENABLE_d OFF CACHE BOOL "Enable d bindings" FORCE) - endif(NOT CMAKE_D_COMPILER) -endif(ENABLE_d) - -if(ENABLE_d) enable_language(D OPTIONAL) if(NOT CMAKE_D_COMPILER_WORKS) message(STATUS "WARNING: D compiler does not work so disabling D examples.") @@ -165,26 +80,40 @@ endif(NOT CMAKE_D_COMPILER_WORKS) endif(ENABLE_d) -# OPTIONAL below currently does not work properly with CMake so attempt -# to deal with a possibly missing compiler first as a workaround. -if(ENABLE_f77 OR ENABLE_f95) - include(CMakeDetermineFortranCompiler) - if(NOT CMAKE_Fortran_COMPILER) - message(STATUS "WARNING: Fortran compiler not found so disabling Fortran examples.") - set(ENABLE_f77 OFF CACHE BOOL "Enable f77 bindings" FORCE) - set(ENABLE_f95 OFF CACHE BOOL "Enable f95 bindings" FORCE) - endif(NOT CMAKE_Fortran_COMPILER) -endif(ENABLE_f77 OR ENABLE_f95) +foreach(COMPILED_LANGUAGE_INFO ${COMPILED_LANGUAGE_INFO_LIST}) + string(REGEX REPLACE "^(.*):.*:.*:.*$" "\\1" language ${COMPILED_LANGUAGE_INFO}) + string(REGEX REPLACE "^.*:(.*):.*:.*$" "\\1" Language ${COMPILED_LANGUAGE_INFO}) + string(REGEX REPLACE "^.*:.*:(.*):.*$" "\\1" language_output ${COMPILED_LANGUAGE_INFO}) + string(REGEX REPLACE "^.*:.*:.*:(.*)$" "\\1" fatal_language ${COMPILED_LANGUAGE_INFO}) + if(ENABLE_${language} AND NOT PLPLOT_${Language}_COMPILER_WORKS) + workaround_9220(${Language} PLPLOT_${Language}_COMPILER_WORKS) + if(NOT PLPLOT_${Language}_COMPILER_WORKS) + if(fatal_language) + message(FATAL_ERROR "${language_output} compiler absolutely required to build this project.") + endif(fatal_language) + message(STATUS "WARNING: no working ${language_output} compiler so disabling ${language} examples.") + set(ENABLE_${language} OFF CACHE BOOL "Enable ${language} bindings" FORCE) + endif(NOT PLPLOT_${Language}_COMPILER_WORKS) + endif(ENABLE_${language} AND NOT PLPLOT_${Language}_COMPILER_WORKS) -if(ENABLE_f77 OR ENABLE_f95) - enable_language(Fortran OPTIONAL) - if(NOT CMAKE_Fortran_COMPILER_WORKS) - message(STATUS "WARNING: Fortran compiler does not work so disabling Fortran examples.") - set(ENABLE_f77 OFF CACHE BOOL "Enable f77 bindings" FORCE) - set(ENABLE_f95 OFF CACHE BOOL "Enable f95 bindings" FORCE) - endif(NOT CMAKE_Fortran_COMPILER_WORKS) -endif(ENABLE_f77 OR ENABLE_f95) + if(ENABLE_${language}) + # Find and check ${Language} compiler + enable_language(${Language} OPTIONAL) + if(NOT CMAKE_${Language}_COMPILER_WORKS) + if(fatal_language) + message(FATAL_ERROR "${language_output} compiler absolutely required to build this project.") + endif(fatal_language) + message(STATUS "WARNING: no working ${language_output} compiler so disabling ${language} examples.") + set(ENABLE_${language} OFF CACHE BOOL "Enable ${language} bindings" FORCE) + endif(NOT CMAKE_${Language}_COMPILER_WORKS) + endif(ENABLE_${language}) +endforeach(COMPILED_LANGUAGE_INFO ${COMPILED_LANGUAGE_INFO_LIST}) +if(ENABLE_ada) + set(ADA_INCLUDE_DIR @ADA_INCLUDE_DIR@) + set(ADA_LIB_DIR @ADA_LIB_DIR@) +endif(ENABLE_ada) + if(ENABLE_f77 OR ENABLE_f95) set(STATIC_OPTS @STATIC_OPTS@) endif(ENABLE_f77 OR ENABLE_f95) @@ -193,25 +122,7 @@ set(F95_MOD_DIR @F95_MOD_DIR@) endif(ENABLE_f95) -# OPTIONAL below currently does not work properly with CMake so attempt -# to deal with a possibly missing compiler first as a workaround. if(ENABLE_java) - include(CMakeDetermineJavaCompiler) - if(NOT CMAKE_Java_COMPILER) - message(STATUS "WARNING: Java compiler not found so disabling Java examples.") - set(ENABLE_java OFF CACHE BOOL "Enable java bindings" FORCE) - endif(NOT CMAKE_Java_COMPILER) -endif(ENABLE_java) - -if(ENABLE_java) - enable_language(Java OPTIONAL) - if(NOT CMAKE_Java_COMPILER_WORKS) - message(STATUS "WARNING: Java compiler does not work so disabling Java examples.") - set(ENABLE_java OFF CACHE BOOL "Enable java bindings" FORCE) - endif(NOT CMAKE_Java_COMPILER_WORKS) -endif(ENABLE_java) - -if(ENABLE_java) find_package(JNI) set(JAR_DIR @JAR_DIR@) endif(ENABLE_java) @@ -251,6 +162,7 @@ endif(ENABLE_qt) set(ENABLE_DYNDRIVERS @ENABLE_DYNDRIVERS@) + # 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. @@ -307,74 +219,43 @@ # 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@) +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_psc @PLD_psc@) +set(PLD_pstex @PLD_pstex@) +set(PLD_psttf @PLD_psttf@) +set(PLD_psttfc @PLD_psttfc@) +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@) -# 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@) +set(PLD_xcairo @PLD_xcairo@) +set(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(CORE_PLD_${DEVICE}) - if(NOT PRESET_DEFAULT) - set(DEFAULT ${CORE_PLD_${DEVICE}}) - endif(NOT PRESET_DEFAULT) - option(PLD_${DEVICE} "Enable ${DEVICE} device" ${DEFAULT}) - else(CORE_PLD_${DEVICE}) - set(PLD_${DEVICE} OFF CACHE BOOL "Enable ${device} device" FORCE) - endif(CORE_PLD_${DEVICE}) - -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. |
[Plplot-cvs] SF.net SVN: plplot:[10439]
trunk/examples/plplot_configure. cmake_installed_examples.in
From: <ai...@us...> - 2009-09-20 18:14:52
|
Revision: 10439 http://plplot.svn.sourceforge.net/plplot/?rev=10439&view=rev Author: airwin Date: 2009-09-20 18:14:45 +0000 (Sun, 20 Sep 2009) Log Message: ----------- Drop extra language testing that had been left in by mistake for installed examples build. Modified Paths: -------------- trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-09-20 17:59:33 UTC (rev 10438) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-09-20 18:14:45 UTC (rev 10439) @@ -64,22 +64,6 @@ "java:Java:Java:OFF" ) -if(ENABLE_cxx) - enable_language(CXX OPTIONAL) - if(NOT CMAKE_CXX_COMPILER_WORKS) - message(STATUS "WARNING: C++ compiler does not work so disabling C++ examples.") - set(ENABLE_cxx OFF CACHE BOOL "Enable cxx bindings" FORCE) - endif(NOT CMAKE_CXX_COMPILER_WORKS) -endif(ENABLE_cxx) - -if(ENABLE_d) - enable_language(D OPTIONAL) - if(NOT CMAKE_D_COMPILER_WORKS) - message(STATUS "WARNING: D compiler does not work so disabling D examples.") - set(ENABLE_d OFF CACHE BOOL "Enable d bindings" FORCE) - endif(NOT CMAKE_D_COMPILER_WORKS) -endif(ENABLE_d) - foreach(COMPILED_LANGUAGE_INFO ${COMPILED_LANGUAGE_INFO_LIST}) string(REGEX REPLACE "^(.*):.*:.*:.*$" "\\1" language ${COMPILED_LANGUAGE_INFO}) string(REGEX REPLACE "^.*:(.*):.*:.*$" "\\1" Language ${COMPILED_LANGUAGE_INFO}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Plplot-cvs] SF.net SVN: plplot:[10482]
trunk/examples/plplot_configure. cmake_installed_examples.in
From: <ai...@us...> - 2009-09-27 01:32:26
|
Revision: 10482 http://plplot.svn.sourceforge.net/plplot/?rev=10482&view=rev Author: airwin Date: 2009-09-27 01:32:19 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Propagate OCAMLOPT to new installed examples build system. Modified Paths: -------------- trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-09-27 01:31:07 UTC (rev 10481) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-09-27 01:32:19 UTC (rev 10482) @@ -113,6 +113,7 @@ if(ENABLE_ocaml) set(OCAMLC @OCAMLC@) + set(OCAMLOPT @OCAMLOPT@) 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. |
[Plplot-cvs] SF.net SVN: plplot:[10530]
trunk/examples/plplot_configure. cmake_installed_examples.in
From: <ai...@us...> - 2009-10-12 23:43:20
|
Revision: 10530 http://plplot.svn.sourceforge.net/plplot/?rev=10530&view=rev Author: airwin Date: 2009-10-12 22:38:17 +0000 (Mon, 12 Oct 2009) Log Message: ----------- Configure FILE_DEVICES_LIST and INTERACTIVE_DEVICES_LIST for installed examples tests. Modified Paths: -------------- trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-10-12 22:34:08 UTC (rev 10529) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-10-12 22:38:17 UTC (rev 10530) @@ -148,62 +148,9 @@ set(ENABLE_DYNDRIVERS @ENABLE_DYNDRIVERS@) -# 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:OFF - # hp7580:OFF - # lj_hpgl is severely broken (segfaults). - # lj_hpgl:OFF - imp:OFF - ljii:OFF - ljiip:OFF - # pbm is severely broken (glibc double free detected) - # 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 - ) - +set(FILE_DEVICES_LIST @FILE_DEVICES_LIST@) # 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. +# implies a maintenance issue. set(PLD_pdfcairo @PLD_pdfcairo@) set(PLD_pngcairo @PLD_pngcairo@) set(PLD_pscairo @PLD_pscairo@) @@ -230,17 +177,32 @@ set(PLD_pbm @PLD_pbm@) set(PLD_pdf @PLD_pdf@) set(PLD_ps @PLD_ps@) -set(PLD_psc @PLD_psc@) set(PLD_pstex @PLD_pstex@) set(PLD_psttf @PLD_psttf@) -set(PLD_psttfc @PLD_psttfc@) 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@) -# Set interactive/external devices that are needed to build certain examples. +# These only used for testing, but not core build +set(PLD_psc @PLD_psc@) +set(PLD_psttfc @PLD_psttfc@) + +set(INTERACTIVE_DEVICES_LIST @INTERACTIVE_DEVICES_LIST@) +# Set interactive devices that are needed to build certain examples. This +# list should be consistent with INTERACTIVE_DEVICES_LIST which implies a +# maintenance issue. + +set(PLD_aqt @PLD_aqt@) +set(PLD_gcw @PLD_gcw@) +set(PLD_ntk @PLD_ntk@) +set(PLD_qtwidget @PLD_qtwidget@) +set(PLD_tk @PLD_tk@) +set(PLD_wingcc @PLD_wingcc@) +set(PLD_wxwidgets @PLD_wxwidgets@) set(PLD_xcairo @PLD_xcairo@) -set(PLD_extcairo @PLD_extcairo@) +set(PLD_xwin @PLD_xwin@) +# Set external devices that are needed to build certain examples. +set(PLD_extcairo @PLD_extcairo@) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Plplot-cvs] SF.net SVN: plplot:[10572]
trunk/examples/plplot_configure. cmake_installed_examples.in
From: <ai...@us...> - 2009-11-10 00:10:28
|
Revision: 10572 http://plplot.svn.sourceforge.net/plplot/?rev=10572&view=rev Author: airwin Date: 2009-11-10 00:10:22 +0000 (Tue, 10 Nov 2009) Log Message: ----------- Define PLD_extqt. Tweak logic order. Modified Paths: -------------- trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2009-11-10 00:08:53 UTC (rev 10571) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2009-11-10 00:10:22 UTC (rev 10572) @@ -44,6 +44,9 @@ set(ENABLE_gnome2 @ENABLE_gnome2@) set(ENABLE_wxwidgets @ENABLE_wxwidgets@) set(ENABLE_qt @ENABLE_qt@) +if(ENABLE_python) + set(ENABLE_pygcw @ENABLE_pygcw@) +endif(ENABLE_python) # Check for all officially supported CMake compilers that we use with # soft-landing support. @@ -118,10 +121,6 @@ set(OCAML_INSTALL_DIR @OCAML_INSTALL_DIR@) endif(ENABLE_ocaml) -if(ENABLE_python) - set(ENABLE_pygcw @ENABLE_pygcw@) -endif(ENABLE_python) - if(ENABLE_tcl OR ENABLE_tk) set(TCL_TCLSH @TCL_TCLSH@) set(MKTCLINDEX @MKTCLINDEX@) @@ -206,3 +205,4 @@ # Set external devices that are needed to build certain examples. set(PLD_extcairo @PLD_extcairo@) +set(PLD_extqt @PLD_extqt@) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Plplot-cvs] SF.net SVN: plplot:[10735]
trunk/examples/plplot_configure. cmake_installed_examples.in
From: <ai...@us...> - 2010-01-04 06:39:32
|
Revision: 10735 http://plplot.svn.sourceforge.net/plplot/?rev=10735&view=rev Author: airwin Date: 2010-01-04 06:39:22 +0000 (Mon, 04 Jan 2010) Log Message: ----------- Help noninteractive tests work properly for new build system for installed examples tree in the embedded blank case by quoting directory variables. Modified Paths: -------------- trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2010-01-04 00:27:58 UTC (rev 10734) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2010-01-04 06:39:22 UTC (rev 10735) @@ -14,7 +14,7 @@ include(pkg-config) set(LIB_TAG "@LIB_TAG@") -set(INCLUDE_DIR @INCLUDE_DIR@) +set(INCLUDE_DIR "@INCLUDE_DIR@") set(MATH_LIB @MATH_LIB@) set(language_info_LIST @language_info_LIST@) @@ -97,8 +97,8 @@ endforeach(COMPILED_LANGUAGE_INFO ${COMPILED_LANGUAGE_INFO_LIST}) if(ENABLE_ada) - set(ADA_INCLUDE_DIR @ADA_INCLUDE_DIR@) - set(ADA_LIB_DIR @ADA_LIB_DIR@) + set(ADA_INCLUDE_DIR "@ADA_INCLUDE_DIR@") + set(ADA_LIB_DIR "@ADA_LIB_DIR@") endif(ENABLE_ada) if(ENABLE_f77 OR ENABLE_f95) @@ -106,19 +106,19 @@ endif(ENABLE_f77 OR ENABLE_f95) if(ENABLE_f95) - set(F95_MOD_DIR @F95_MOD_DIR@) + set(F95_MOD_DIR "@F95_MOD_DIR@") endif(ENABLE_f95) if(ENABLE_java) find_package(JNI) - set(JAR_DIR @JAR_DIR@) + set(JAR_DIR "@JAR_DIR@") endif(ENABLE_java) if(ENABLE_ocaml) set(OCAMLC @OCAMLC@) set(OCAMLOPT @OCAMLOPT@) - set(CMAKE_INSTALL_LIBDIR @CMAKE_INSTALL_LIBDIR@) - set(OCAML_INSTALL_DIR @OCAML_INSTALL_DIR@) + set(CMAKE_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@") + set(OCAML_INSTALL_DIR "@OCAML_INSTALL_DIR@") endif(ENABLE_ocaml) if(ENABLE_tcl OR ENABLE_tk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Plplot-cvs] SF.net SVN: plplot:[10848]
trunk/examples/plplot_configure. cmake_installed_examples.in
From: <ai...@us...> - 2010-03-05 17:45:54
|
Revision: 10848 http://plplot.svn.sourceforge.net/plplot/?rev=10848&view=rev Author: airwin Date: 2010-03-05 17:45:48 +0000 (Fri, 05 Mar 2010) Log Message: ----------- Propagate ENABLE_pyqt4 to installed examples build system. This allows implementation of the test_pyqt4_example target for the installed examples. Modified Paths: -------------- trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2010-03-05 17:44:11 UTC (rev 10847) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2010-03-05 17:45:48 UTC (rev 10848) @@ -37,6 +37,7 @@ set(ENABLE_octave @ENABLE_octave@) set(ENABLE_pdl @ENABLE_pdl@) set(ENABLE_python @ENABLE_python@) +set(ENABLE_pyqt4 @ENABLE_pyqt4@) set(ENABLE_tcl @ENABLE_tcl@) # Interactive bindings This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Plplot-cvs] SF.net SVN: plplot:[10856]
trunk/examples/plplot_configure. cmake_installed_examples.in
From: <ai...@us...> - 2010-03-06 07:10:38
|
Revision: 10856 http://plplot.svn.sourceforge.net/plplot/?rev=10856&view=rev Author: airwin Date: 2010-03-06 07:10:32 +0000 (Sat, 06 Mar 2010) Log Message: ----------- Propagate additional ocaml-related variables to installed examples build system so that xgtk_interfaceocaml builds properly there. Modified Paths: -------------- trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2010-03-06 07:09:00 UTC (rev 10855) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2010-03-06 07:10:32 UTC (rev 10856) @@ -118,6 +118,9 @@ if(ENABLE_ocaml) set(OCAMLC @OCAMLC@) set(OCAMLOPT @OCAMLOPT@) + set(OCAMLFIND @OCAMLFIND@) + set(OCAML_HAS_CAIRO @OCAML_HAS_CAIRO@) + set(OCAML_HAS_GTK @OCAML_HAS_GTK@) 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. |
[Plplot-cvs] SF.net SVN: plplot:[11122]
trunk/examples/plplot_configure. cmake_installed_examples.in
From: <ai...@us...> - 2010-08-03 04:17:49
|
Revision: 11122 http://plplot.svn.sourceforge.net/plplot/?rev=11122&view=rev Author: airwin Date: 2010-08-03 04:17:43 +0000 (Tue, 03 Aug 2010) Log Message: ----------- Installed examples build needs SH_EXECUTABLE to allow configuration of tk/standard_examples(.in) and tcl/standard_examples(.in). Modified Paths: -------------- trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2010-08-03 04:16:27 UTC (rev 11121) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2010-08-03 04:17:43 UTC (rev 11122) @@ -16,6 +16,7 @@ set(LIB_TAG "@LIB_TAG@") set(INCLUDE_DIR "@INCLUDE_DIR@") set(MATH_LIB @MATH_LIB@) +set(SH_EXECUTABLE @SH_EXECUTABLE@) set(language_info_LIST @language_info_LIST@) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Plplot-cvs] SF.net SVN: plplot:[11651]
trunk/examples/plplot_configure. cmake_installed_examples.in
From: <ai...@us...> - 2011-03-19 18:39:10
|
Revision: 11651 http://plplot.svn.sourceforge.net/plplot/?rev=11651&view=rev Author: airwin Date: 2011-03-19 18:39:03 +0000 (Sat, 19 Mar 2011) Log Message: ----------- Propagate F77_INCLUDE_DIR to installed examples build system so that f77 examples will build correctly. Modified Paths: -------------- trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2011-03-19 17:01:14 UTC (rev 11650) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2011-03-19 18:39:03 UTC (rev 11651) @@ -103,11 +103,13 @@ set(ADA_LIB_DIR "@ADA_LIB_DIR@") endif(ENABLE_ada) -if(ENABLE_f77 OR ENABLE_f95) +if(ENABLE_f77) set(STATIC_OPTS @STATIC_OPTS@) -endif(ENABLE_f77 OR ENABLE_f95) + set(F77_INCLUDE_DIR @F77_INCLUDE_DIR@) +endif(ENABLE_f77) if(ENABLE_f95) + set(STATIC_OPTS @STATIC_OPTS@) set(F95_MOD_DIR "@F95_MOD_DIR@") endif(ENABLE_f95) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Plplot-cvs] SF.net SVN: plplot:[12016]
trunk/examples/plplot_configure. cmake_installed_examples.in
From: <and...@us...> - 2011-10-31 11:28:43
|
Revision: 12016 http://plplot.svn.sourceforge.net/plplot/?rev=12016&view=rev Author: andrewross Date: 2011-10-31 11:28:37 +0000 (Mon, 31 Oct 2011) Log Message: ----------- Small fix to ensure cmake support for building the ocaml examples works in the install tree. examples/ocaml/CMakeFiles.txt relies on BUILD_SHARED_LIBS being set in order to add the right linker options in the install tree. Without this building the examples in the install tree will fail once the plplot build directory has been deleted. Modified Paths: -------------- trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2011-10-28 19:07:41 UTC (rev 12015) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2011-10-31 11:28:37 UTC (rev 12016) @@ -23,6 +23,8 @@ set(MATH_LIB @MATH_LIB@) set(SH_EXECUTABLE @SH_EXECUTABLE@) +set(BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@) + set(language_info_LIST @language_info_LIST@) # This list of set commands must be consistent with language_info_LIST This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Plplot-cvs] SF.net SVN: plplot:[12073]
trunk/examples/plplot_configure. cmake_installed_examples.in
From: <and...@us...> - 2011-11-30 11:11:29
|
Revision: 12073 http://plplot.svn.sourceforge.net/plplot/?rev=12073&view=rev Author: andrewross Date: 2011-11-30 11:11:23 +0000 (Wed, 30 Nov 2011) Log Message: ----------- Fix install-tree cmake build of tk examples for case with NON_TRANSITIVE=ON. Modified Paths: -------------- trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2011-11-30 10:36:26 UTC (rev 12072) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2011-11-30 11:11:23 UTC (rev 12073) @@ -145,6 +145,8 @@ set(ENABLE_itk @ENABLE_itk@) set(TCL_INCLUDE_PATH @TCL_INCLUDE_PATH@) set(TK_INCLUDE_PATH @TK_INCLUDE_PATH@) + set(TCL_LIBRARY @TCL_LIBRARY@) + set(TK_LIBRARY @TK_LIBRARY@) endif(ENABLE_tk) if(ENABLE_wxwidgets) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Plplot-cvs] SF.net SVN: plplot:[12305]
trunk/examples/plplot_configure. cmake_installed_examples.in
From: <ai...@us...> - 2013-04-24 20:13:59
|
Revision: 12305 http://sourceforge.net/p/plplot/code/12305 Author: airwin Date: 2013-04-24 20:13:55 +0000 (Wed, 24 Apr 2013) Log Message: ----------- Pass USE_RPATH to build system for installed examples since that variable is required in order to do the OCaml examples build. Modified Paths: -------------- trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2013-04-10 18:55:10 UTC (rev 12304) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2013-04-24 20:13:55 UTC (rev 12305) @@ -228,3 +228,6 @@ set(DIFF_EXECUTABLE @DIFF_EXECUTABLE@) set(TAIL_EXECUTABLE @TAIL_EXECUTABLE@) set(CMP_EXECUTABLE @CMP_EXECUTABLE@) + +# ocaml examples build needs this. +set(USE_RPATH @USE_RPATH@) \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Plplot-cvs] SF.net SVN: plplot:[12412]
trunk/examples/plplot_configure. cmake_installed_examples.in
From: <ai...@us...> - 2013-07-10 04:32:15
|
Revision: 12412 http://sourceforge.net/p/plplot/code/12412 Author: airwin Date: 2013-07-10 04:32:13 +0000 (Wed, 10 Jul 2013) Log Message: ----------- Propagate WIN32_AND_NOT_CYGWIN and WIN32_OR_CYGWIN to the installed examples build system. Modified Paths: -------------- trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2013-07-09 21:32:02 UTC (rev 12411) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2013-07-10 04:32:13 UTC (rev 12412) @@ -230,4 +230,8 @@ set(CMP_EXECUTABLE @CMP_EXECUTABLE@) # ocaml examples build needs this. -set(USE_RPATH @USE_RPATH@) \ No newline at end of file +set(USE_RPATH @USE_RPATH@) + +# WIN32 and CYGWIN derived variables +set(WIN32_AND_NOT_CYGWIN @WIN32_AND_NOT_CYGWIN@) +set(WIN32_OR_CYGWIN @WIN32_OR_CYGWIN@) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Plplot-cvs] SF.net SVN: plplot:[12710]
trunk/examples/plplot_configure. cmake_installed_examples.in
From: <ai...@us...> - 2013-11-17 00:49:10
|
Revision: 12710 http://sourceforge.net/p/plplot/code/12710 Author: airwin Date: 2013-11-17 00:49:08 +0000 (Sun, 17 Nov 2013) Log Message: ----------- Propagate DATA_DIR to the installed examples build system so that the tclsh_standard_examples(.in) and wish_standard_examples(.in) scripts will be correctly configured in that case. Tested by Alan W. Irwin <ai...@us...> on Linux using the CMake-based build system for the installed examples and the test_interactive target. Modified Paths: -------------- trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2013-11-17 00:45:35 UTC (rev 12709) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2013-11-17 00:49:08 UTC (rev 12710) @@ -137,6 +137,8 @@ set(TCL_TCLSH @TCL_TCLSH@) set(MKTCLINDEX ${CMAKE_SOURCE_DIR}/tcl/mktclIndex) set(MKTCLINDEX_ARGS @MKTCLINDEX_ARGS@) + # Needed to configure tclsh_standard_examples and wish_standard_examples + set(DATA_DIR @DATA_DIR@) endif(ENABLE_tcl OR ENABLE_tk) if(ENABLE_tk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Plplot-cvs] SF.net SVN: plplot:[13103]
trunk/examples/plplot_configure. cmake_installed_examples.in
From: <ai...@us...> - 2014-04-21 00:08:08
|
Revision: 13103 http://sourceforge.net/p/plplot/code/13103 Author: airwin Date: 2014-04-21 00:08:04 +0000 (Mon, 21 Apr 2014) Log Message: ----------- Propagate PLPLOT_USE_QT5 variable to CMake-based build system for the installed examples. Modified Paths: -------------- trunk/examples/plplot_configure.cmake_installed_examples.in Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2014-04-21 00:06:13 UTC (rev 13102) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2014-04-21 00:08:04 UTC (rev 13103) @@ -233,3 +233,6 @@ # WIN32 and CYGWIN derived variables set(WIN32_AND_NOT_CYGWIN @WIN32_AND_NOT_CYGWIN@) set(WIN32_OR_CYGWIN @WIN32_OR_CYGWIN@) + +#Qt5 support +set(PLPLOT_USE_QT5 @PLPLOT_USE_QT5@) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |