diff options
| author | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-01-29 15:06:45 +0100 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-01-29 15:07:54 +0000 |
| commit | 5e339a0f97710fc79518354124d7a8ab2738e632 (patch) | |
| tree | f6a1bc976a3e8a649f0132ea750a0869bcf39da5 | |
| parent | 4bb44a17f659465d817bafa820c5a3d0293c1541 (diff) | |
cmake: Add trivial FindLibproxy.cmake
And fix link to it
Change-Id: Ie4f29a35a83d19ab83933faf3bcd7d62cffa68b8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | cmake/FindLibproxy.cmake | 3 | ||||
| -rw-r--r-- | src/network/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/network/configure.cmake | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/cmake/FindLibproxy.cmake b/cmake/FindLibproxy.cmake new file mode 100644 index 0000000000..611a8bd7d5 --- /dev/null +++ b/cmake/FindLibproxy.cmake @@ -0,0 +1,3 @@ +find_package(PkgConfig) + +pkg_check_modules(Libproxy libproxy-1.0 IMPORTED_TARGET) diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 576424386d..ce7e5ed77c 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -133,7 +133,7 @@ elseif(WIN32 AND NOT WINRT) set(proxy_sources kernel/qnetworkproxy_win.cpp) elseif(QT_FEATURE_libproxy) set(proxy_sources kernel/qnetworkproxy_libproxy.cpp) - set(proxy_libs libproxy libdl) + set(proxy_libs PkgConfig::Libproxy dl) else() set(proxy_sources kernel/qnetworkproxy_generic.cpp) endif() diff --git a/src/network/configure.cmake b/src/network/configure.cmake index dd7f487fc5..3bc73701da 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -6,8 +6,8 @@ #### Libraries -find_package(libproxy) -set_package_properties(libproxy PROPERTIES TYPE OPTIONAL) +find_package(Libproxy) +set_package_properties(Libproxy PROPERTIES TYPE OPTIONAL) find_package(OpenSSL) set_package_properties(OpenSSL PROPERTIES TYPE OPTIONAL) @@ -146,7 +146,7 @@ qt_feature_definition("ipv6ifname" "QT_NO_IPV6IFNAME" NEGATE VALUE "1") qt_feature("libproxy" PRIVATE LABEL "libproxy" AUTODETECT OFF - CONDITION libproxy_FOUND + CONDITION Libproxy_FOUND ) qt_feature("linux_netlink" PRIVATE LABEL "Linux AF_NETLINK" |