Commit f5fc63bc by Carlos Martín Nieto

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.
parent 096ac799
...@@ -19,7 +19,7 @@ matrix: ...@@ -19,7 +19,7 @@ matrix:
fast_finish: true fast_finish: true
include: include:
- compiler: i586-mingw32msvc-gcc - 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 - compiler: gcc
env: COVERITY=1 env: COVERITY=1
allow_failures: allow_failures:
......
...@@ -195,7 +195,7 @@ ELSE() ...@@ -195,7 +195,7 @@ ELSE()
ENDIF() ENDIF()
# Optional external dependency: libssh2 # Optional external dependency: libssh2
IF (USE_SSH AND NOT MINGW) IF (USE_SSH)
FIND_PACKAGE(LIBSSH2) FIND_PACKAGE(LIBSSH2)
ENDIF() ENDIF()
IF (LIBSSH2_FOUND) IF (LIBSSH2_FOUND)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment