summaryrefslogtreecommitdiffstats
path: root/cmake/README.md
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-05-24 10:33:17 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2019-05-24 14:16:54 +0000
commit13e9d88e5656847719d9eab0fb6c305fc2d089c2 (patch)
treea3597556969bb498240ce004ce6e15998bc843bd /cmake/README.md
parentbfed22e3b7b6de27359d41f1a51ea345f7284ce2 (diff)
Update vcpkg instructions
Let's recommend vcpkg only on Windows for now. That's best maintained and works best there. Change-Id: Ied06b6a3cb26d9e56d3f525c1d5a410223754fba Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'cmake/README.md')
-rw-r--r--cmake/README.md26
1 files changed, 5 insertions, 21 deletions
diff --git a/cmake/README.md b/cmake/README.md
index 57f87e0d84..544aec4633 100644
--- a/cmake/README.md
+++ b/cmake/README.md
@@ -20,36 +20,20 @@ to be supplied from the outside to the build now. You may find apt-get/brew/etc.
* For the time being we try to keep qmake working so that we do not interfere too much with ongoing development.
-# Building against VCPKG
+# Building against VCPKG on Windows
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
- * Linux: ``x64-linux``
- * macOS: ``x64-osx``
- * Windows: ``qt-x86-windows-static``
- * Build Qt dependencies: ``vcpkg install zlib pcre2 double-conversion harfbuzz freetype``
- * When running cmake in qtbase, pass ``-DCMAKE_TOOLCHAIN_FILE=/path/to/your/vcpkg/scripts/buildsystems/vcpkg.cmake``
+ * 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``
+ * 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).
-# Building VCPKG on macOS
-
-vcpkg doesn't currently buid on macOS with Xcode provided clang, due to missing filesystem headers. It's expected to be fixed in Xcode 11.
-
-See https://github.com/Microsoft/vcpkg/issues/4475 and https://github.com/Microsoft/vcpkg/issues/6068.
-
-Vcpkg can be built with homebrew provided gcc though.
-
- * Install homebrew: ```/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"```
- * Install gcc via homebrew: ``brew install gcc``
-
-After installing gcc, just follow the vcpkg instructions in the section above.
-
# Building against homebrew on macOS
-Instead of using vcpkg, you can also use homebrew to get the 3rd party dependencies.
+You may use brew to install dependencies needed to build QtBase.
* Install homebrew: ```/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"```
* Build Qt dependencies: ``brew install pcre2 harfbuzz freetype``