[zypp-devel] [PATCH] Fix build with alternative libproxy implementations, by using pkg-config

We are currently assuming that libproxy itself will provide a Findlibproxy.cmake for us. But in the case where the "real" libproxy has been replaced with an alternative, saner implementation that just talks to PacRunner, that doesn't work. Fall back in that case to using pkg-config as $DEITY intended. --- diff --git a/cmake/modules/Findlibproxy.cmake b/cmake/modules/Findlibproxy.cmake new file mode 100644 index 0000000..a5303df --- /dev/null +++ b/cmake/modules/Findlibproxy.cmake @@ -0,0 +1,7 @@ +# The "real" libproxy provides its own Findlibproxy.cmake but saner, simpler +# alternatives like the PacRunner replacement which *just* queries PacRunner +# directly will only provide a .pc file. So use pkg-config to find it... + +INCLUDE ( FindPkgConfig ) + +PKG_SEARCH_MODULE( LIBPROXY libproxy-1.0 ) -- 1.7.4.4 -- David Woodhouse Open Source Technology Centre David.Woodhouse@intel.com Intel Corporation -- To unsubscribe, e-mail: zypp-devel+unsubscribe@opensuse.org For additional commands, e-mail: zypp-devel+help@opensuse.org

On Fri, 2011-04-29 at 22:27 +0100, David Woodhouse wrote:
We are currently assuming that libproxy itself will provide a Findlibproxy.cmake for us. But in the case where the "real" libproxy has been replaced with an alternative, saner implementation that just talks to PacRunner, that doesn't work.
Fall back in that case to using pkg-config as $DEITY intended.
Ping.
--- diff --git a/cmake/modules/Findlibproxy.cmake b/cmake/modules/Findlibproxy.cmake new file mode 100644 index 0000000..a5303df --- /dev/null +++ b/cmake/modules/Findlibproxy.cmake @@ -0,0 +1,7 @@ +# The "real" libproxy provides its own Findlibproxy.cmake but saner, simpler +# alternatives like the PacRunner replacement which *just* queries PacRunner +# directly will only provide a .pc file. So use pkg-config to find it... + +INCLUDE ( FindPkgConfig ) + +PKG_SEARCH_MODULE( LIBPROXY libproxy-1.0 ) -- 1.7.4.4
-- David Woodhouse Open Source Technology Centre David.Woodhouse@intel.com Intel Corporation
-- dwmw2 -- To unsubscribe, e-mail: zypp-devel+unsubscribe@opensuse.org For additional commands, e-mail: zypp-devel+help@opensuse.org
participants (1)
-
David Woodhouse