diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-06-22 19:59:41 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-06-22 19:59:41 +0000 |
| commit | ca21823b65ea22aea7534e28a607f7b7d2fdcff6 (patch) | |
| tree | 17c54ee81284568526278b3357e355cf65710ca2 /net/libproxy/files/patch-CMakeLists.txt | |
| parent | x11/qterminal: Update to 0.9.0 (diff) | |
Update net/libproxy to 0.4.15
* this release switched the build system to cmake
* move libproxy-gnome to libproxy-gnome2 for consistency
* add new slave libproxy-webkit3
* try to simplify the whole thing
* bump revisions in the dependencies
Reviewed by: gnome (kwm), mat
Differential Revision: https://reviews.freebsd.org/D15655
Notes
Notes:
svn path=/head/; revision=473062
Diffstat (limited to 'net/libproxy/files/patch-CMakeLists.txt')
| -rw-r--r-- | net/libproxy/files/patch-CMakeLists.txt | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/net/libproxy/files/patch-CMakeLists.txt b/net/libproxy/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..f9b7708ac3c3 --- /dev/null +++ b/net/libproxy/files/patch-CMakeLists.txt @@ -0,0 +1,31 @@ +As the library is only built in the master port, and therfore missing in the +build directory for the slave ports, find it via pkg-config and link against it, +when building a slave. + +--- CMakeLists.txt.orig 2017-05-11 09:33:33 UTC ++++ CMakeLists.txt +@@ -23,6 +23,15 @@ else() + set(CMAKE_INSTALL_CONFIG_NAME ${CMAKE_BUILD_TYPE}) + endif() + ++# Make building the library optional. ++option(WITH_LIBRARY "Build libproxy.so" ON) ++ ++if (NOT WITH_LIBRARY) ++ # For the other ports provide an easy way to link against libproxy.so via PkgConfig::LIBPROXY. ++ find_package(PkgConfig) ++ pkg_check_modules(LIBPROXY libproxy-1.0 REQUIRED IMPORTED_TARGET) ++endif () ++ + include(cmake/cpack.cmk) + include(cmake/ctest.cmk) + include(cmake/paths.cmk) +@@ -56,5 +65,7 @@ endif() + + # Always build these + add_subdirectory(libproxy) +-add_subdirectory(utils) ++if (WITH_LIBRARY) ++ add_subdirectory(utils) ++endif() + |