Mailinglist Archive: zypp-devel (18 mails)
| < Previous | Next > |
[zypp-devel] [PATCH] Fix build with alternative libproxy implementations, by using pkg-config
- From: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
- Date: Fri, 29 Apr 2011 22:27:12 +0100
- Message-id: <1304112432.32168.48.camel@macbook.infradead.org>
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@xxxxxxxxx Intel Corporation
--
To unsubscribe, e-mail: zypp-devel+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-devel+help@xxxxxxxxxxxx
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@xxxxxxxxx Intel Corporation
--
To unsubscribe, e-mail: zypp-devel+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-devel+help@xxxxxxxxxxxx
| < Previous | Next > |