Merge topic 'MinorPkgConfigDocImprovement'

59ccf38 Minor improvements to the UsePkgConfig.cmake docs
ad11118 Remove trailing whitespace
This commit is contained in:
Brad King 2011-09-26 11:24:43 -04:00 committed by CMake Topic Stage
commit ea1901b6a4
1 changed files with 12 additions and 11 deletions

View File

@ -1,13 +1,14 @@
# - obsolete pkg-config module for CMake # - Osolete pkg-config module for CMake, use FindPkgConfig instead.
# #
# Defines the following macros: # This module defines the following macro:
# #
# PKGCONFIG(package includedir libdir linkflags cflags) # PKGCONFIG(package includedir libdir linkflags cflags)
# #
# Calling PKGCONFIG will fill the desired information into the 4 given arguments, # Calling PKGCONFIG will fill the desired information into the 4 given arguments,
# e.g. PKGCONFIG(libart-2.0 LIBART_INCLUDE_DIR LIBART_LINK_DIR LIBART_LINK_FLAGS LIBART_CFLAGS) # e.g. PKGCONFIG(libart-2.0 LIBART_INCLUDE_DIR LIBART_LINK_DIR LIBART_LINK_FLAGS LIBART_CFLAGS)
# if pkg-config was NOT found or the specified software package doesn't exist, the # if pkg-config was NOT found or the specified software package doesn't exist, the
# variable will be empty when the function returns, otherwise they will contain the respective information # variable will be empty when the function returns, otherwise they will contain
# the respective information
# #
#============================================================================= #=============================================================================
@ -27,7 +28,7 @@ FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config )
MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags) MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
MESSAGE(STATUS MESSAGE(STATUS
"WARNING: you are using the obsolete 'PKGCONFIG' macro use FindPkgConfig") "WARNING: you are using the obsolete 'PKGCONFIG' macro, use FindPkgConfig")
# reset the variables at the beginning # reset the variables at the beginning
SET(${_include_DIR}) SET(${_include_DIR})
SET(${_link_DIR}) SET(${_link_DIR})