From 728c2fbd017451a868ed9471c9d001f6d4ffff96 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 3 Jul 2015 12:36:26 +0200 Subject: cmake: Fix zlib include directory Signed-off-by: Andreas Schneider --- src/CMakeLists.txt | 2 +- tests/CMakeLists.txt | 6 +++--- tests/pkd/CMakeLists.txt | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6263e3e3..4865d765 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -54,7 +54,7 @@ endif (GCRYPT_LIBRARY) if (WITH_ZLIB) set(LIBSSH_PRIVATE_INCLUDE_DIRS ${LIBSSH_PRIVATE_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIR} ) set(LIBSSH_LINK_LIBRARIES diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index fc15ef03..3bbb3309 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -9,9 +9,9 @@ set(TORTURE_LIBRARY torture) include_directories( ${LIBSSH_PUBLIC_INCLUDE_DIRS} ${CMOCKA_INCLUDE_DIR} - ${OPENSSL_INCLUDE_DIRS} - ${GCRYPT_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIRS} + ${OPENSSL_INCLUDE_DIR} + ${GCRYPT_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/tests/pkd/CMakeLists.txt b/tests/pkd/CMakeLists.txt index 515dae10..07384341 100644 --- a/tests/pkd/CMakeLists.txt +++ b/tests/pkd/CMakeLists.txt @@ -5,9 +5,9 @@ if (WITH_SERVER AND UNIX AND NOT WIN32) include_directories( ${LIBSSH_PUBLIC_INCLUDE_DIRS} ${CMOCKA_INCLUDE_DIR} - ${OPENSSL_INCLUDE_DIRS} - ${GCRYPT_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIRS} + ${OPENSSL_INCLUDE_DIR} + ${GCRYPT_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR} -- cgit