From f5fc63bc0cdc19250b384ea62e2e1796128831ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Wed, 30 Apr 2014 10:55:58 +0200 Subject: [PATCH] Don't exclude libssh2 from MinGW It reportedly works. It does not however work when cross-compiling on Travis, so let's disable it there. This fixes #2311. --- .travis.yml | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f25ff7681..fcae726dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ matrix: fast_finish: true include: - compiler: i586-mingw32msvc-gcc - env: OPTIONS="-DBUILD_CLAR=OFF -DWIN32=ON -DMINGW=ON" + env: OPTIONS="-DBUILD_CLAR=OFF -DWIN32=ON -DMINGW=ON -DUSE_SSH=OFF" - compiler: gcc env: COVERITY=1 allow_failures: diff --git a/CMakeLists.txt b/CMakeLists.txt index ac75ebbcb..b5bd669f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -195,7 +195,7 @@ ELSE() ENDIF() # Optional external dependency: libssh2 -IF (USE_SSH AND NOT MINGW) +IF (USE_SSH) FIND_PACKAGE(LIBSSH2) ENDIF() IF (LIBSSH2_FOUND)