summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-06-07 15:03:32 -0400
committerBrad King <brad.king@kitware.com>2016-06-07 15:05:11 -0400
commitdbc9f73d0e9ed5fd8a2a0e64e17d81f860643efd (patch)
treef57a5e86728956bed6020a59f91d4fc1f72f7a43
parent9703b32c1c75b0b343bb5043030a08a1b1345a20 (diff)
downloadcmake-dbc9f73d0e9ed5fd8a2a0e64e17d81f860643efd.tar.gz
libarchive: Restore OpenSSL include directory from upstream
In commit v3.6.0-rc1~100^2 (libarchive: Drop early use of crypto library, 2016-05-03) we accidentally dropped the include directory for OpenSSL as well as the library. Without that, it works only accidentally when CHECK_CRYPTO happens to choose the OpenSSL implementation and add the include directory. Reported-by: Bradley Lowekamp <blowekamp@mail.nih.gov>
-rw-r--r--Utilities/cmlibarchive/CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index 453a7378d2..09bef5192c 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -509,6 +509,7 @@ 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})
ENDIF(OPENSSL_FOUND)
ELSE()
SET(OPENSSL_FOUND FALSE) # Override cached value