[PATCH 3/5] Fix libssh libssl linker order for Android

Anton Lundin glance at acc.umu.se
Wed Jul 15 15:59:34 PDT 2015


We need to link things in the correct order, even on android.

Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 CMakeLists.txt | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b94d13..123714b 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)
-- 
2.1.4



More information about the subsurface mailing list