diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-06-21 21:09:25 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-06-22 09:02:37 +0000 |
| commit | 87942459a27465439eb85d083545bfe0fddf2ff4 (patch) | |
| tree | 6fe628a0da498985d351ff52c6ac48e5f4983b73 /coin_build_instructions.py | |
| parent | aa75437f9119d997dd290471ac3e2cc88ca88bf1 (diff) | |
Don't package OpenSSL libraries on Windows Coin builds
This is due to
http://doc.qt.io/qt-5/ssl.html#import-and-export-restrictions
A user may still pass --openssl option if they wish to package
the libraries for their own local build.
Task-number: PYSIDE-715
Change-Id: Iadade188ffa13decf03bc21b016718176f6ead6e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'coin_build_instructions.py')
| -rw-r--r-- | coin_build_instructions.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 65e198be4..c9d59a0a6 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -107,8 +107,7 @@ def call_setup(python_ver): cmd += ["--qmake=" + CI_ENV_INSTALL_DIR + "/bin/qmake"] elif CI_HOST_OS == "Windows": - cmd += ["--qmake=" + CI_ENV_INSTALL_DIR + "\\bin\\qmake.exe", - "--openssl=C:\\openssl\\bin"] + cmd += ["--qmake=" + CI_ENV_INSTALL_DIR + "\\bin\\qmake.exe"] else: cmd += ["--qmake=" + CI_ENV_INSTALL_DIR + "/bin/qmake"] cmd += ["--build-tests", |