diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-05-14 16:57:09 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-05-16 07:44:00 +0000 |
commit | 9d9144b2b44677d2862e389b7a83900ee3e8e44c (patch) | |
tree | 9be85f81072a07ec8b94020792fba8da37143930 | |
parent | 69c19662bbb0de20374116a38ef673f8dc44b053 (diff) |
Clarify and fix the path to openssl libs for Coin Windows build
When the --openssl option is given, it should point to the openssl bin
directory, and not to the openssl.exe file itself.
Clarify this in the setup.py comments, and fix it in
coin_build_instructions.py.
Task-number: PYSIDE-660
Change-Id: I5b20a8c5a445c9f628c5abc258c43271c490e08c
Reviewed-by: Simo Fält <simo.falt@qt.io>
-rw-r--r-- | coin_build_instructions.py | 2 | ||||
-rw-r--r-- | setup.py | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index ba823b87d..8d88b9633 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -76,7 +76,7 @@ def call_setup(python_ver): elif CI_HOST_OS == "Windows": cmd += ["--qmake=" + CI_ENV_INSTALL_DIR + "\\bin\\qmake.exe", - "--openssl=C:\\openssl\\bin\\openssl"] + "--openssl=C:\\openssl\\bin"] else: cmd += ["--qmake=" + CI_ENV_INSTALL_DIR + "/bin/qmake"] cmd += ["--build-tests", @@ -56,9 +56,10 @@ and --cmake=/path/to/bin/cmake respectively. -For windows, if OpenSSL support is required, it is necessary to specify -the directory with: - --openssl=/path/to/openssl/bin +For Windows, if OpenSSL support is required, it's necessary to specify +the directory path that contains the OpenSSL shared libraries +"libeay32.dll" and "ssleay32.dll", for example: + --openssl=C:\OpenSSL-Win64\bin ADDITIONAL OPTIONS: @@ -150,8 +151,9 @@ OPTIONAL: Specifying the --openssl option is only required on Windows. It is a no-op for other platforms. - You can specify the location of OpenSSL DLLs with option: - --openssl=</path/to/openssl/bin>. + You can specify the location of the OpenSSL DLLs with the + following option: + --openssl=</path/to/openssl/bin-directory>. You can download OpenSSL for Windows here: http://slproweb.com/products/Win32OpenSSL.html (*) |