aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2015-07-03 11:38:58 +0200
committerAndreas Schneider <asn@cryptomilk.org>2015-07-03 11:40:04 +0200
commitb45933d30d9a1d1ce94757a4dc76e0d7a5f31c44 (patch)
tree4bf22750ffda626f89542d276a9d37191a6e016e
parent1613ed556d94ab9f7601836b3371e2c19bb2a1c6 (diff)
downloadlibssh-b45933d30d9a1d1ce94757a4dc76e0d7a5f31c44.tar.gz
libssh-b45933d30d9a1d1ce94757a4dc76e0d7a5f31c44.tar.xz
libssh-b45933d30d9a1d1ce94757a4dc76e0d7a5f31c44.zip
cmake: Fix OpenSSL detection in non-standard path
This should fix the detection on Windows. Signed-off-by: Andreas Schneider <asn@cryptomilk.org> (cherry picked from commit 613b71b3851697f8e83ab83bb1c785b644a648a4)
-rw-r--r--ConfigureChecks.cmake12
1 files changed, 6 insertions, 6 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 5fb06534..c0326c20 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -66,28 +66,28 @@ if (WIN32)
endif (WIN32)
if (OPENSSL_FOUND)
- set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIRS})
+ set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
check_include_file(openssl/des.h HAVE_OPENSSL_DES_H)
if (NOT HAVE_OPENSSL_DES_H)
message(FATAL_ERROR "Could not detect openssl/des.h")
endif()
- set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIRS})
+ set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
check_include_file(openssl/aes.h HAVE_OPENSSL_AES_H)
if (NOT HAVE_OPENSSL_AES_H)
message(FATAL_ERROR "Could not detect openssl/aes.h")
endif()
- set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIRS})
+ set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
check_include_file(openssl/blowfish.h HAVE_OPENSSL_BLOWFISH_H)
- set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIRS})
+ set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
check_include_file(openssl/ecdh.h HAVE_OPENSSL_ECDH_H)
- set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIRS})
+ set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
check_include_file(openssl/ec.h HAVE_OPENSSL_EC_H)
- set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIRS})
+ set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
check_include_file(openssl/ecdsa.h HAVE_OPENSSL_ECDSA_H)
endif()