kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: maintain backwards compatibility in UsePkgConfig

Browse Source
This commit is contained in:
Bill Hoffman 2006-11-29 16:12:40 -05:00
parent ccb77b65c6
commit 9b42fff02f
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Modules/FindPkgConfig.cmake
View File

@ -360,10 +360,15 @@ macro(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
message(STATUS "WARNING: you are using the obsolete 'PKGCONFIG' macro") message(STATUS "WARNING: you are using the obsolete 'PKGCONFIG' macro")
_pkg_check_modules_internal(0 0 _PKGCONFIG_TMP "${_package}") _pkg_check_modules_internal(0 0 _PKGCONFIG_TMP "${_package}")
if (_PKGCONFIG_TMP_FOUND) if (_PKGCONFIG_TMP_FOUND)
set(${_include_DIR} ${_PKGCONFIG_TMP_INCLUDEDIR}) # To be compatible with obsolete module must return blank-delimited strings.
set(${_link_DIR} ${_PKGCONFIG_TMP_LIBDIR}) # Also, lead with a blank (for TRUE/FALSE compatibility, 2.4.4 appears to
set(${_link_FLAGS} ${_PKGCONFIG_TMP_LDFLAGS}) # have returned a blank sometimes followed by nl for the situation
set(${_cflags} ${_PKGCONFIG_TMP_CFLAGS}) # where the pkg-config module has been found [e.g., _PKGCONFIG_TMP_FOUND]
# but does not define the desired quantity.
string(REGEX REPLACE ";" " " ${_include_DIR} " ${_PKGCONFIG_TMP_INCLUDE_DIRS}")
string(REGEX REPLACE ";" " " ${_link_DIR} " ${_PKGCONFIG_TMP_LIBRARY_DIRS}")
string(REGEX REPLACE ";" " " ${_link_FLAGS} " ${_PKGCONFIG_TMP_LDFLAGS}")
string(REGEX REPLACE ";" " " ${_cflags} " ${_PKGCONFIG_TMP_CFLAGS}")
set(_return_VALUE 0) set(_return_VALUE 0)
else(_PKGCONFIG_TMP_FOUND) else(_PKGCONFIG_TMP_FOUND)
set(${_include_DIR}) set(${_include_DIR})

7
Modules/UsePkgConfig.cmake
View File

@ -11,3 +11,10 @@
# #
INCLUDE(FindPkgConfig) INCLUDE(FindPkgConfig)
# Retain backwards compatibility with old PKGCONFIG_EXECUTABLE name.
IF(PKG_CONFIG_EXECUTABLE)
SET(PKGCONFIG_EXECUTABLE ${PKG_CONFIG_EXECUTABLE})
ELSE(PKG_CONFIG_EXECUTABLE)
SET(PKGCONFIG_EXECUTABLE PKGCONFIG_EXECUTABLE-NOTFOUND)
ENDIF(PKG_CONFIG_EXECUTABLE)