From: <hba...@us...> - 2009-04-04 21:23:57
|
Revision: 9789 http://plplot.svn.sourceforge.net/plplot/?rev=9789&view=rev Author: hbabcock Date: 2009-04-04 21:23:44 +0000 (Sat, 04 Apr 2009) Log Message: ----------- Changed the pkg_check_pkgconfig macro to also return the library version. Changed cairo.cmake to check this version and print a warning about text clipping speed for older versions. Updated the pkg_check_pkgconfig macro in the other drivers .cmake files. Modified Paths: -------------- trunk/cmake/modules/FindAGG.cmake trunk/cmake/modules/cairo.cmake trunk/cmake/modules/gcw.cmake trunk/cmake/modules/pango.cmake trunk/cmake/modules/pkg-config.cmake trunk/cmake/modules/psttf.cmake Modified: trunk/cmake/modules/FindAGG.cmake =================================================================== --- trunk/cmake/modules/FindAGG.cmake 2009-04-03 13:12:50 UTC (rev 9788) +++ trunk/cmake/modules/FindAGG.cmake 2009-04-04 21:23:44 UTC (rev 9789) @@ -10,7 +10,7 @@ if(PKG_CONFIG_EXECUTABLE) # Use pkg-config (if available) to provide location of AGG headers and # libraries and also provide basis for defining AGG_DEFINITIONS. - pkg_check_pkgconfig(libagg _AGGIncDir _AGGLinkDir _AGGLinkFlags _AGGCflags _AGG) + pkg_check_pkgconfig(libagg _AGGIncDir _AGGLinkDir _AGGLinkFlags _AGGCflags _AGGVersion _AGG) #message(STATUS "_AGGIncDir = ${_AGGIncDir}") #message(STATUS "_AGGLinkDir = ${_AGGLinkDir}") #message(STATUS "_AGGLinkFlags = ${_AGGLinkFlags}") Modified: trunk/cmake/modules/cairo.cmake =================================================================== --- trunk/cmake/modules/cairo.cmake 2009-04-03 13:12:50 UTC (rev 9788) +++ trunk/cmake/modules/cairo.cmake 2009-04-04 21:23:44 UTC (rev 9789) @@ -93,9 +93,18 @@ linkdir linkflags cflags + version _CAIRO ) if(linkflags) + # Check that the pangocairo library version is recent + # enough to efficiently handle text clipping. + # If it is not then we print a warning. + transform_version(NUMERICAL_PANGOCAIRO_MINIMUM_VERSION "1.20.5") + transform_version(NUMERICAL_PANGOCAIRO_VERSION "${version}") + if(NUMERICAL_PANGOCAIRO_VERSION LESS "${NUMERICAL_PANGOCAIRO_MINIMUM_VERSION}") + message("Pango Cairo version (${version}) < 1.20.5, if text rendering is slow recommend turning off text clipping") + endif(NUMERICAL_PANGOCAIRO_VERSION LESS "${NUMERICAL_PANGOCAIRO_MINIMUM_VERSION}") set(cairo_RPATH ${linkdir}) if(PLD_xcairo AND X11_COMPILE_FLAGS) # Blank-delimited required. Modified: trunk/cmake/modules/gcw.cmake =================================================================== --- trunk/cmake/modules/gcw.cmake 2009-04-03 13:12:50 UTC (rev 9788) +++ trunk/cmake/modules/gcw.cmake 2009-04-04 21:23:44 UTC (rev 9789) @@ -48,9 +48,9 @@ # there is a question whether all that ton of extra potentially interfering # libraries might be causing a segfault that is observed for the # dynamic devices case. -# pkg_check_pkgconfig(libgnomeui-2.0 includedir libdir linkflags cflags _GCW1) +# pkg_check_pkgconfig(libgnomeui-2.0 includedir libdir linkflags cflags version _GCW1) # if(linkflags) - pkg_check_pkgconfig(libgnomeprintui-2.2 includedir libdir linkflags1 cflags1 _GCW2) + pkg_check_pkgconfig(libgnomeprintui-2.2 includedir libdir linkflags1 cflags1 version1 _GCW2) if(linkflags1) # Requires blank-delimited list. string(REGEX REPLACE ";" " " gcw_COMPILE_FLAGS "${cflags1}") @@ -79,7 +79,7 @@ if(PLD_gcw) # Check for gthread-2.0 done in cf/gcw.ac, but result not actually used # anywhere in the autotools configuration so we comment it out here. -# pkg_check_pkgconfig(gthread-2.0 includedir libdir linkflags cflags _GCW3) +# pkg_check_pkgconfig(gthread-2.0 includedir libdir linkflags cflags version _GCW3) set(include_files_to_check "math.h" "glib.h" Modified: trunk/cmake/modules/pango.cmake =================================================================== --- trunk/cmake/modules/pango.cmake 2009-04-03 13:12:50 UTC (rev 9788) +++ trunk/cmake/modules/pango.cmake 2009-04-04 21:23:44 UTC (rev 9789) @@ -22,7 +22,7 @@ if(PKG_CONFIG_EXECUTABLE) pkg_check_pkgconfig( pango - PANGO_INCLUDE_DIR PANGO_LINK_DIR PANGO_LINK_FLAGS PANGO_CFLAGS _PANGO1 + PANGO_INCLUDE_DIR PANGO_LINK_DIR PANGO_LINK_FLAGS PANGO_CFLAGS PANGO_VERSION _PANGO1 ) if(NOT PANGO_LINK_FLAGS) message(STATUS @@ -32,7 +32,7 @@ pkg_check_pkgconfig( pangoft2 - PANGOFT2_INCLUDE_DIR PANGOFT2_LINK_DIR PANGOFT2_LINK_FLAGS PANGOFT2_CFLAGS _PANGO2 + PANGOFT2_INCLUDE_DIR PANGOFT2_LINK_DIR PANGOFT2_LINK_FLAGS PANGOFT2_CFLAGS PANGOFT2_VERSION _PANGO2 ) if(NOT PANGOFT2_LINK_FLAGS) message(STATUS Modified: trunk/cmake/modules/pkg-config.cmake =================================================================== --- trunk/cmake/modules/pkg-config.cmake 2009-04-03 13:12:50 UTC (rev 9788) +++ trunk/cmake/modules/pkg-config.cmake 2009-04-04 21:23:44 UTC (rev 9789) @@ -59,7 +59,7 @@ set(pkg_config_true "#") endif(PKG_CONFIG_EXECUTABLE) -macro(pkg_check_pkgconfig _package _include_DIR _link_DIR _link_FLAGS _cflags) +macro(pkg_check_pkgconfig _package _include_DIR _link_DIR _link_FLAGS _cflags _version) # Similar to legacy pkgconfig only these results are derived # from pkg_check_modules and therefore are returned as lists rather than # blank-delimited strings. Also, the _link_FLAGS value is converted @@ -79,12 +79,14 @@ set(${_link_DIR} ${${_prefix}_LIBRARY_DIRS}) cmake_link_flags(${_link_FLAGS} "${${_prefix}_LDFLAGS}") set(${_cflags} ${${_prefix}_CFLAGS}) + set(${_version} ${${_prefix}_VERSION}) set(_return_VALUE 0) else(${_prefix}_FOUND) set(${_include_DIR}) set(${_link_DIR}) set(${_link_FLAGS}) set(${_cflags}) + set(${_version}) set(_return_VALUE 1) endif(${_prefix}_FOUND) #message("${_prefix}_FOUND = ${${_prefix}_FOUND}") @@ -223,3 +225,4 @@ #message("${_link_flags_out} = ${${_link_flags_out}}") endif("${_link_flags_in}" STREQUAL "") endmacro(cmake_link_flags) + Modified: trunk/cmake/modules/psttf.cmake =================================================================== --- trunk/cmake/modules/psttf.cmake 2009-04-03 13:12:50 UTC (rev 9788) +++ trunk/cmake/modules/psttf.cmake 2009-04-04 21:23:44 UTC (rev 9789) @@ -47,7 +47,7 @@ endif(PLD_psttf) if(PLD_psttf) - pkg_check_pkgconfig("lasi;pango;pangoft2" includedir libdir linkflags cflags _PSTTF) + pkg_check_pkgconfig("lasi;pango;pangoft2" includedir libdir linkflags cflags version _PSTTF) if(linkflags) #blank-separated required. string(REGEX REPLACE ";" " " psttf_COMPILE_FLAGS "${cflags}") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |