From: <sm...@us...> - 2008-10-23 12:58:32
|
Revision: 8955 http://plplot.svn.sourceforge.net/plplot/?rev=8955&view=rev Author: smekal Date: 2008-10-23 12:37:02 +0000 (Thu, 23 Oct 2008) Log Message: ----------- FindAGG.cmake looks also for libaggfontfreetype.a and adds it to the AGG_LIBRARIES variable if found. Modified Paths: -------------- trunk/cmake/modules/FindAGG.cmake Modified: trunk/cmake/modules/FindAGG.cmake =================================================================== --- trunk/cmake/modules/FindAGG.cmake 2008-10-22 15:01:00 UTC (rev 8954) +++ trunk/cmake/modules/FindAGG.cmake 2008-10-23 12:37:02 UTC (rev 8955) @@ -35,8 +35,10 @@ # plain name for static libraries case. if(BUILD_SHARED_LIBS) set(AGGLIB_NAMES = "agg_pic;agg") + set(AGGFONTLIB_NAMES = "aggfontfreetype_pic;aggfontfreetype") else(BUILD_SHARED_LIBS) set(AGGLIB_NAMES = "agg;agg_pic") + set(AGGFONTLIB_NAMES = "aggfontfreetype;aggfontfreetype_pic;") endif(BUILD_SHARED_LIBS) FIND_LIBRARY(AGG_LIBRARIES NAMES ${AGGLIB_NAMES} PATHS @@ -44,6 +46,15 @@ /usr/local/lib /usr/lib ) + FIND_LIBRARY(AGGFONT_LIBRARIES NAMES ${AGGFONTLIB_NAMES} + PATHS + ${_AGGLinkDir} + /usr/local/lib + /usr/lib + ) + if (AGGFONT_LIBRARIES AND AGG_LIBRARIES) + set(AGG_LIBRARIES ${AGG_LIBRARIES} ${AGGFONT_LIBRARIES}) + endif (AGGFONT_LIBRARIES AND AGG_LIBRARIES) if (AGG_INCLUDE_DIR AND AGG_LIBRARIES) set(AGG_FOUND TRUE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2011-11-27 19:26:51
|
Revision: 12058 http://plplot.svn.sourceforge.net/plplot/?rev=12058&view=rev Author: airwin Date: 2011-11-27 19:26:44 +0000 (Sun, 27 Nov 2011) Log Message: ----------- Make AGG find_package module completely depend on pkg_config rather than searching both the pkg-config location and system locations for the AGG library. In particular, if the link flags variable returned by pkg_check_pkgconfig is CMake logically false, then gracefully exit with AGG_FOUND OFF. Modified Paths: -------------- trunk/cmake/modules/FindAGG.cmake Modified: trunk/cmake/modules/FindAGG.cmake =================================================================== --- trunk/cmake/modules/FindAGG.cmake 2011-11-27 19:18:29 UTC (rev 12057) +++ trunk/cmake/modules/FindAGG.cmake 2011-11-27 19:26:44 UTC (rev 12058) @@ -17,48 +17,46 @@ #message(STATUS "_AGGCflags = ${_AGGCflags}") endif(PKG_CONFIG_EXECUTABLE) -FIND_PATH(AGG_INCLUDE_DIR agg2/agg_pixfmt_gray.h - ${_AGGIncDir} - /usr/local/include - /usr/include - ) +if(_AGGLinkFlags) + find_path(AGG_INCLUDE_DIR agg2/agg_pixfmt_gray.h + ${_AGGIncDir} + ) -# Prefer _pic variant of library name for shared libraries case, and -# plain name for static libraries case. -if(BUILD_SHARED_LIBS) - set(AGGLIB_NAMES = "agg_pic;agg") - set(AGGFONTLIB_NAMES = "aggfontfreetype_pic;aggfontfreetype") -else(BUILD_SHARED_LIBS) - set(AGGLIB_NAMES = "agg;agg_pic") - set(AGGFONTLIB_NAMES = "aggfontfreetype;aggfontfreetype_pic;") -endif(BUILD_SHARED_LIBS) -FIND_LIBRARY(AGG_LIBRARY NAMES ${AGGLIB_NAMES} - PATHS - ${_AGGLinkDir} - /usr/local/lib - /usr/lib - ) -FIND_LIBRARY(AGGFONT_LIBRARY NAMES ${AGGFONTLIB_NAMES} - PATHS - ${_AGGLinkDir} - /usr/local/lib - /usr/lib - ) + # Prefer _pic variant of library name for shared libraries case, and + # plain name for static libraries case. + if(BUILD_SHARED_LIBS) + set(AGGLIB_NAMES = "agg_pic;agg") + set(AGGFONTLIB_NAMES = "aggfontfreetype_pic;aggfontfreetype") + else(BUILD_SHARED_LIBS) + set(AGGLIB_NAMES = "agg;agg_pic") + set(AGGFONTLIB_NAMES = "aggfontfreetype;aggfontfreetype_pic;") + endif(BUILD_SHARED_LIBS) + find_library(AGG_LIBRARY NAMES ${AGGLIB_NAMES} + PATHS + ${_AGGLinkDir} + ) + find_library(AGGFONT_LIBRARY NAMES ${AGGFONTLIB_NAMES} + PATHS + ${_AGGLinkDir} + /usr/local/lib + /usr/lib + ) -MARK_AS_ADVANCED(AGG_INCLUDE_DIR AGG_LIBRARY AGGFONT_LIBRARY) + mark_as_advanced(AGG_INCLUDE_DIR AGG_LIBRARY AGGFONT_LIBRARY) -# Set uncached variable AGG_LIBRARIES (needed by user and also -# by FIND_PACKAGE_HANDLE_STANDARD_ARGS) -if(AGG_LIBRARY AND AGGFONT_LIBRARY) - set(AGG_LIBRARIES ${AGG_LIBRARY} ${AGGFONT_LIBRARY}) -elseif(AGG_LIBRARY) + # Set uncached variable AGG_LIBRARIES (needed by user and also + # by FIND_PACKAGE_HANDLE_STANDARD_ARGS) + if(AGG_LIBRARY AND AGGFONT_LIBRARY) + set(AGG_LIBRARIES ${AGG_LIBRARY} ${AGGFONT_LIBRARY}) + elseif(AGG_LIBRARY) set(AGG_LIBRARIES ${AGG_LIBRARY}) -endif(AGG_LIBRARY AND AGGFONT_LIBRARY) + endif(AGG_LIBRARY AND AGGFONT_LIBRARY) +endif(_AGGLinkFlags) # Standard 2.6.x method of handling QUIETLY and REQUIRED arguments and set # AGG_FOUND to TRUE if all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(AGG DEFAULT_MSG AGG_LIBRARIES AGG_INCLUDE_DIR) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(AGG DEFAULT_MSG AGG_LIBRARIES AGG_INCLUDE_DIR) if(AGG_FOUND) # Set additional uncached variables that users of this module should use. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |