diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-18 15:44:34 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-03-08 11:04:00 +0000 |
| commit | a4dc92c8802f49462d7bbc7185c6e2aeb9e6a86e (patch) | |
| tree | e174544a4fae2277cb4bae1e304e29a046923e3b | |
| parent | 56714be7d05afb94c63b658a4fdb2bedd1bee645 (diff) | |
Use system protobuf if found
Search for protobuf library and compiler, and use them if found.
Change-Id: I310eca661ed2dda14349e84a6769d2ae79ffb7c5
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | src/core/config/linux.pri | 2 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 2fa6aa5c6..ac476a110 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -45,4 +45,4 @@ use?(system_snappy): GYP_CONFIG += use_system_snappy=1 use?(system_vpx): GYP_CONFIG += use_system_libvpx=1 use?(system_icu): GYP_CONFIG += use_system_icu=1 use?(system_ffmpeg): GYP_CONFIG += use_system_ffmpeg=1 - +use?(system_protobuf): GYP_CONFIG += use_system_protobuf=1 diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 5674ea3a5..b92c8af61 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -41,10 +41,16 @@ defineTest(runConfigure) { else: log("System libwebp or libwebpdemux not found. Using Chromium's copies.$${EOL}") packagesExist(libxml-2.0,libxslt): WEBENGINE_CONFIG += use_system_libxslt else: log("System libxml2 or libxslt not found. Using Chromium's copies.$${EOL}") - for(package, $$list("libevent jsoncpp opus")) { + for(package, $$list("libevent jsoncpp opus protobuf")) { packagesExist($$package): WEBENGINE_CONFIG += use_system_$$package else: log("System $$package not found. Using Chromium's copy.$${EOL}") } + use?(system_protobuf) { + !system("which protoc > /dev/null") { + log("Protobuf compiler not found. Using Chromium's copy of protobuf.$${EOL}") + WEBENGINE_CONFIG -= use_system_protobuf + } + } config_libvpx: WEBENGINE_CONFIG += use_system_vpx else: log("Compatible system libvpx not found. Using Chromium's copy.$${EOL}") config_srtp: WEBENGINE_CONFIG += use_system_libsrtp |