Merge topic 'MinorPkgConfigDocImprovement'
59ccf38
Minor improvements to the UsePkgConfig.cmake docsad11118
Remove trailing whitespace
This commit is contained in:
commit
ea1901b6a4
|
@ -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)
|
||||
#
|
||||
# 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)
|
||||
# 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)
|
||||
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
|
||||
SET(${_include_DIR})
|
||||
SET(${_link_DIR})
|
||||
|
@ -42,20 +43,20 @@ MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
|
|||
# and if the package of interest also exists for pkg-config, then get the information
|
||||
IF(NOT _return_VALUE)
|
||||
|
||||
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=includedir
|
||||
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=includedir
|
||||
OUTPUT_VARIABLE ${_include_DIR} )
|
||||
STRING(REGEX REPLACE "[\r\n]" " " ${_include_DIR} "${${_include_DIR}}")
|
||||
|
||||
|
||||
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=libdir
|
||||
|
||||
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=libdir
|
||||
OUTPUT_VARIABLE ${_link_DIR} )
|
||||
STRING(REGEX REPLACE "[\r\n]" " " ${_link_DIR} "${${_link_DIR}}")
|
||||
|
||||
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --libs
|
||||
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --libs
|
||||
OUTPUT_VARIABLE ${_link_FLAGS} )
|
||||
STRING(REGEX REPLACE "[\r\n]" " " ${_link_FLAGS} "${${_link_FLAGS}}")
|
||||
|
||||
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags
|
||||
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags
|
||||
OUTPUT_VARIABLE ${_cflags} )
|
||||
STRING(REGEX REPLACE "[\r\n]" " " ${_cflags} "${${_cflags}}")
|
||||
|
||||
|
@ -64,10 +65,10 @@ MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
|
|||
MESSAGE(STATUS "PKGCONFIG() indicates that ${_package} is not installed (install the package which contains ${_package}.pc if you want to support this feature)")
|
||||
|
||||
ENDIF(NOT _return_VALUE)
|
||||
|
||||
|
||||
# if pkg-config has NOT been found, INFORM the user
|
||||
ELSE(PKGCONFIG_EXECUTABLE)
|
||||
|
||||
|
||||
MESSAGE(STATUS "WARNING: PKGCONFIG() indicates that the tool pkg-config has not been found on your system. You should install it.")
|
||||
|
||||
ENDIF(PKGCONFIG_EXECUTABLE)
|
||||
|
|
Loading…
Reference in New Issue