diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-05-24 11:59:52 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-05-24 14:19:51 +0000 |
| commit | e4f0680c4a722b02fb31fc1693e09059e94326f4 (patch) | |
| tree | 40eb6a48f51c7ef238c9ee4dfd7f7907337cc106 /cmake/README.md | |
| parent | 13e9d88e5656847719d9eab0fb6c305fc2d089c2 (diff) | |
Fix static zstd linkage
Upstream's cmake build system installs libzstd_static for static builds,
so look for that as well. Now we can also recommend installing it via
vcpkg.
Change-Id: I0ba4c45ecd90bf7b1c9f1e5f84a440caa976a23c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'cmake/README.md')
| -rw-r--r-- | cmake/README.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/README.md b/cmake/README.md index 544aec4633..7b38877831 100644 --- a/cmake/README.md +++ b/cmake/README.md @@ -27,7 +27,7 @@ You may use vcpkg to install dependencies needed to build QtBase. * ```git clone -b qt https://github.com/tronical/vcpkg``` * Run ```bootstrap-vcpkg.bat``` or ```bootstrap-vcpkg.sh``` * Set the ``VCPKG_DEFAULT_TRIPLET`` environment variable to ``qt-x64-windows-static`` or ``qt-x86-windows-static`` - * Build Qt dependencies: ``vcpkg install zlib pcre2 harfbuzz freetype openssl`` + * Build Qt dependencies: ``vcpkg install zlib pcre2 harfbuzz freetype openssl zstd`` * When running cmake in qtbase, pass ``-DCMAKE_TOOLCHAIN_FILE=/path/to/your/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=%VCPKG_DEFAULT_TRIPLET%`` Previously CMAKE_PREFIX_PATH was mentioned instead of CMAKE_TOOLCHAIN_FILE. Setting CMAKE_PREFIX_PATH to the vcpkg installed folder is not enough, because then find_package is not overridden by vcpkg and cmake might not propagate all library dependencies for static packages (freetype is one such package). |