[Cmake-commits] CMake branch, next, updated. v3.5.2-1216-g40b7584
Brad King
brad.king at kitware.com
Tue May 3 09:53:51 EDT 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 40b75849ef8fd822e2b1a05f0d9a872550b4bc1b (commit)
via 59d28b2849b13ca275b28d5f8b689b28dae4ac28 (commit)
from 47c487443e5fa5bf2b9a533767f3ab5cae8ab4db (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=40b75849ef8fd822e2b1a05f0d9a872550b4bc1b
commit 40b75849ef8fd822e2b1a05f0d9a872550b4bc1b
Merge: 47c4874 59d28b2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 3 09:53:50 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 3 09:53:50 2016 -0400
Merge topic 'update-libarchive' into next
59d28b28 libarchive: Drop early use of crypto library
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59d28b2849b13ca275b28d5f8b689b28dae4ac28
commit 59d28b2849b13ca275b28d5f8b689b28dae4ac28
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 3 09:52:07 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 3 09:53:05 2016 -0400
libarchive: Drop early use of crypto library
We already add the crypto library after the ssl library when using
OpenSSL. Do not add it to the list of libraries individually or we may
end up with the wrong order later. Further investigation will be needed
to see how this change can be reconciled with the upstream need for the
original line.
diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index c6ee7a8..453a737 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -509,8 +509,6 @@ IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
FIND_PACKAGE(OpenSSL)
IF(OPENSSL_FOUND)
SET(HAVE_LIBCRYPTO 1)
- INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
- LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_CRYPTO_LIBRARY})
ENDIF(OPENSSL_FOUND)
ELSE()
SET(OPENSSL_FOUND FALSE) # Override cached value
-----------------------------------------------------------------------
Summary of changes:
Utilities/cmlibarchive/CMakeLists.txt | 2 --
1 file changed, 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list