From 9a754972ed2f45733aace842d4cb87016a6ef803 Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Thu, 16 Jul 2015 00:59:34 +0200 Subject: Fix libssh libssl linker order for Android We need to link things in the correct order, even on android. Signed-off-by: Anton Lundin Signed-off-by: Dirk Hohndel --- CMakeLists.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 0bd223261..ab7be1bfc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,16 +55,15 @@ if(LIBGIT2_FROM_PKGCONFIG) if(USE_LIBGIT23_API) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_LIBGIT23_API") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_LIBGIT23_API") - if(FORCE_LIBSSH) - pkg_config_library(LIBSSH2 libssh2 REQUIRED) - set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} ${LIBSSH2_LIBRARIES}) - endif() if(ANDROID) # for Android we need to force a static link against ssl and crypto # this is a bit hacky, but it seems to work set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} ${LIBGIT2_LIBRARY_DIRS}/libssl.a ${LIBGIT2_LIBRARY_DIRS}/libcrypto.a) endif() - + if(FORCE_LIBSSH) + pkg_config_library(LIBSSH2 libssh2 REQUIRED) + set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} ${LIBSSH2_LIBRARIES}) + endif() endif() else() find_package(LIBGIT2 REQUIRED) -- cgit v1.2.3-70-g09d2