summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-11-15 13:36:38 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-11-15 13:37:04 (GMT)
commit47f8998d92ba637c67bd6eef63e7ab44224db074 (patch)
tree74488ec8fcf13bd62811fc12178330acb97b7869
parent5c4482133100ff2b58063c60ce80b6595bb20cf5 (diff)
parentb40d45cdb101a91fb2f7cc6fa8078337816aa92d (diff)
downloadCMake-47f8998d92ba637c67bd6eef63e7ab44224db074.zip
CMake-47f8998d92ba637c67bd6eef63e7ab44224db074.tar.gz
CMake-47f8998d92ba637c67bd6eef63e7ab44224db074.tar.bz2
Merge topic 'update-prebuilt-openssl'
b40d45cd Utilities/Release: Update to openssl-1.1.0g 78aeb300 Utilities/Release: Update to openssl-1.0.2m Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1478
-rw-r--r--Utilities/Release/linux64_release.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/Utilities/Release/linux64_release.cmake b/Utilities/Release/linux64_release.cmake
index e1aa3e7..97fc33c 100644
--- a/Utilities/Release/linux64_release.cmake
+++ b/Utilities/Release/linux64_release.cmake
@@ -29,9 +29,9 @@ CURSES_LIBRARY:FILEPATH=/home/kitware/ncurses-5.9/lib/libncurses.a
CURSES_INCLUDE_PATH:PATH=/home/kitware/ncurses-5.9/include
FORM_LIBRARY:FILEPATH=/home/kitware/ncurses-5.9/lib/libform.a
CMAKE_USE_OPENSSL:BOOL=ON
-OPENSSL_CRYPTO_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2j/lib/libcrypto.a
-OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.2j/include
-OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2j/lib/libssl.a
+OPENSSL_CRYPTO_LIBRARY:STRING=/home/kitware/openssl-1.1.0g/lib/libcrypto.a;-pthread
+OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.1.0g/include
+OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.1.0g/lib/libssl.a
PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3
CPACK_SYSTEM_NAME:STRING=Linux-x86_64
BUILD_QtDialog:BOOL:=TRUE