diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-16 14:39:14 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-06-16 14:39:14 (GMT) |
| commit | 5e92047421a60a7287ff00fdc9dec33b1acc94ec (patch) | |
| tree | f8c52906bc6efd73d36d59fa797c6300666ebbe7 | |
| parent | ee223dfa9138cfe960d5d7a6dc14b044b7e032bf (diff) | |
| parent | 6d1cef1aed6d86c0651aecb9cd0fd384db6de90c (diff) | |
| download | CMake-5e92047421a60a7287ff00fdc9dec33b1acc94ec.zip CMake-5e92047421a60a7287ff00fdc9dec33b1acc94ec.tar.gz CMake-5e92047421a60a7287ff00fdc9dec33b1acc94ec.tar.bz2 | |
Merge topic 'update-prebuilt-openssl'
6d1cef1a Utilities/Release: Update to openssl-1.0.2c
| -rw-r--r-- | Utilities/Release/linux64_release.cmake | 6 | ||||
| -rw-r--r-- | Utilities/Release/magrathea_release.cmake | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Utilities/Release/linux64_release.cmake b/Utilities/Release/linux64_release.cmake index 513f42f..265e0d7 100644 --- a/Utilities/Release/linux64_release.cmake +++ b/Utilities/Release/linux64_release.cmake @@ -11,9 +11,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.1j/lib/libcrypto.a -OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.1j/include -OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.1j/lib/libssl.a +OPENSSL_CRYPTO_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2c/lib/libcrypto.a +OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.2c/include +OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2c/lib/libssl.a CPACK_SYSTEM_NAME:STRING=Linux-x86_64 BUILD_QtDialog:BOOL:=TRUE CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE diff --git a/Utilities/Release/magrathea_release.cmake b/Utilities/Release/magrathea_release.cmake index 1bf75dd..79fa319 100644 --- a/Utilities/Release/magrathea_release.cmake +++ b/Utilities/Release/magrathea_release.cmake @@ -11,9 +11,9 @@ CURSES_LIBRARY:FILEPATH=/usr/i686-gcc-332s/lib/libncurses.a CURSES_INCLUDE_PATH:PATH=/usr/i686-gcc-332s/include/ncurses FORM_LIBRARY:FILEPATH=/usr/i686-gcc-332s/lib/libform.a CMAKE_USE_OPENSSL:BOOL=ON -OPENSSL_CRYPTO_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.1g-install/lib/libcrypto.a -OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.1g-install/include -OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.1g-install/lib/libssl.a +OPENSSL_CRYPTO_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2c/lib/libcrypto.a +OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.2c/include +OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2c/lib/libssl.a CPACK_SYSTEM_NAME:STRING=Linux-i386 BUILD_QtDialog:BOOL:=TRUE CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE |