mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-21 05:49:42 +08:00
Point to protobuf install prefix but not the CMake dir in protobuf_ROOT
The <Package>_ROOT should point to the package prefix, where
CMake should look for the respective cmake/, lib/cmake, and other
CMake package directories. Setting directly it to package path is
incorrect.
Pick-to: 6.8
Change-Id: Id8859c29da08144c60ed3d6301d2c65c8d602d1f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 9c39ae1424)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
committed by
Qt Cherry-pick Bot
parent
a048dbfa4c
commit
46c1dedc0c
@@ -92,7 +92,7 @@ cmake "$targetDir" -G"Ninja Multi-Config" \
|
||||
ninja all:all
|
||||
sudo env "PATH=$PATH" ninja install:all
|
||||
|
||||
SetEnvVar "protobuf_ROOT" "$installPrefix/lib/cmake/protobuf"
|
||||
SetEnvVar "protobuf_ROOT" "$installPrefix"
|
||||
|
||||
# Refresh shared library cache if OS isn't macOS
|
||||
if uname -a |grep -qv "Darwin"; then
|
||||
|
||||
Reference in New Issue
Block a user