diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-16 19:52:45 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-16 19:52:45 +0100 |
| commit | aaa312e56871e89b97704e5ac8c686fe7966c122 (patch) | |
| tree | 63f6a6c3e89152025de942a0e68153a5cb868ecb /package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake | |
| parent | 9d097a780c0ffe2c9dbe146046d5b68123c47708 (diff) | |
| parent | b1e843d40eea9bc684436f4635018b7c19eb93ea (diff) | |
Merge branch 'master' of git+ssh://www.openadk.org/git/openadk
Conflicts:
TODO
Diffstat (limited to 'package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake')
| -rw-r--r-- | package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake b/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake index 9a140e652..e7fcdfd2d 100644 --- a/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake +++ b/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake @@ -1,5 +1,5 @@ ---- libssh-0.5.3.orig/cmake/Modules/FindZLIB.cmake 2012-11-20 12:41:49.000000000 +0100 -+++ libssh-0.5.3/cmake/Modules/FindZLIB.cmake 2014-01-11 12:11:52.000000000 +0100 +--- libssh-0.6.3.orig/cmake/Modules/FindZLIB.cmake 2013-12-21 18:37:12.000000000 +0100 ++++ libssh-0.6.3/cmake/Modules/FindZLIB.cmake 2014-03-14 09:07:03.296701809 +0100 @@ -61,11 +61,11 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI NAMES zlib.h @@ -13,9 +13,9 @@ ) mark_as_advanced(ZLIB_INCLUDE_DIR) -@@ -98,12 +98,12 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI - zlib +@@ -99,12 +99,12 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI zlib1 + zlibd PATHS + ${ZLIB_ROOT_DIR}/lib /usr/local/lib |