From 75d11a34620966a07638337959aa8cd8c9d89893 Mon Sep 17 00:00:00 2001 From: "dominique.leuenberger@gmail.com" Date: Fri, 4 May 2012 19:01:30 +0000 Subject: Change the way we decide upon pkg-config being available. Fixes issue 179. git-svn-id: http://libproxy.googlecode.com/svn/trunk@841 c587cffe-e639-0410-9787-d7902ae8ed56 --- NEWS | 1 + libproxy/cmake/pkgconfig.cmk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 80aef79..e111a0a 100644 --- a/NEWS +++ b/NEWS @@ -21,6 +21,7 @@ New in version 0.4.8 (not yet released) - #147: Use ${CMAKE_DL_LIBS} instead of assuming libdl is correct. - #176: python bindings: guard the destructor. - #177: Speed up importing of libproxy in python. + - #179: CMAKE 2.8.8 does not define PKG_CONFIG_FOUND New in version 0.4.7 ============================== diff --git a/libproxy/cmake/pkgconfig.cmk b/libproxy/cmake/pkgconfig.cmk index a19fb5f..89bfc62 100644 --- a/libproxy/cmake/pkgconfig.cmk +++ b/libproxy/cmake/pkgconfig.cmk @@ -3,7 +3,7 @@ if(NOT WIN32 AND NOT APPLE) # Define our magical px_check_modules function function(px_check_modules name) - if(PKG_CONFIG_FOUND) + if(PKG_CONFIG_EXECUTABLE) option(WITH_${name} "Search for ${name} package" ON) if (WITH_${name}) pkg_check_modules(${name} ${ARGN}) -- cgit v1.2.1