[cmake-commits] hoffman committed FindPkgConfig.cmake 1.1 1.2
UsePkgConfig.cmake 1.3 1.4
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Nov 29 16:12:42 EST 2006
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv5665
Modified Files:
FindPkgConfig.cmake UsePkgConfig.cmake
Log Message:
ENH: maintain backwards compatibility in UsePkgConfig
Index: UsePkgConfig.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UsePkgConfig.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- UsePkgConfig.cmake 22 Nov 2006 18:44:59 -0000 1.3
+++ UsePkgConfig.cmake 29 Nov 2006 21:12:40 -0000 1.4
@@ -11,3 +11,10 @@
#
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)
+
Index: FindPkgConfig.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPkgConfig.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindPkgConfig.cmake 22 Nov 2006 18:44:59 -0000 1.1
+++ FindPkgConfig.cmake 29 Nov 2006 21:12:40 -0000 1.2
@@ -360,10 +360,15 @@
message(STATUS "WARNING: you are using the obsolete 'PKGCONFIG' macro")
_pkg_check_modules_internal(0 0 _PKGCONFIG_TMP "${_package}")
if (_PKGCONFIG_TMP_FOUND)
- set(${_include_DIR} ${_PKGCONFIG_TMP_INCLUDEDIR})
- set(${_link_DIR} ${_PKGCONFIG_TMP_LIBDIR})
- set(${_link_FLAGS} ${_PKGCONFIG_TMP_LDFLAGS})
- set(${_cflags} ${_PKGCONFIG_TMP_CFLAGS})
+ # To be compatible with obsolete module must return blank-delimited strings.
+ # Also, lead with a blank (for TRUE/FALSE compatibility, 2.4.4 appears to
+ # have returned a blank sometimes followed by nl for the situation
+ # 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)
else(_PKGCONFIG_TMP_FOUND)
set(${_include_DIR})
More information about the Cmake-commits
mailing list