summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56>2012-05-04 19:01:30 +0000
committerdominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56>2012-05-04 19:01:30 +0000
commit75d11a34620966a07638337959aa8cd8c9d89893 (patch)
tree84fe6983b33c6124c9af0b0cc4e3770bb1d4512b
parentf5a83ef0903ec6937fba1e37e83a1380b19f01ce (diff)
downloadlibproxy-75d11a34620966a07638337959aa8cd8c9d89893.tar.gz
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
-rw-r--r--NEWS1
-rw-r--r--libproxy/cmake/pkgconfig.cmk2
2 files changed, 2 insertions, 1 deletions
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})