diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2014-04-30 10:55:58 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-04-30 11:15:41 +0200 |
| commit | f5fc63bc0cdc19250b384ea62e2e1796128831ec (patch) | |
| tree | f2c2d3ec22e205c984f9bbdd2edb1eed16b437f3 | |
| parent | 096ac799a37e235d894641f2974a6d6105e41d4c (diff) | |
| download | libgit2-cmn/known-libs.tar.gz | |
Don't exclude libssh2 from MinGWcmn/known-libs
It reportedly works. It does not however work when cross-compiling on
Travis, so let's disable it there.
This fixes #2311.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | 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) |