mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Code cleanup

Browse source 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-12-17 14:01:58 -02:00 • committed by Dirk Hohndel
parent bbc7cbdf75
commit aa6d9f5ba0
1 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

46
cmake/Modules/HandleFindGit2.cmake
View file

@ -2,30 +2,30 @@
if(LIBGIT2_FROM_PKGCONFIG) if(LIBGIT2_FROM_PKGCONFIG)
pkg_config_library(LIBGIT2 libgit2 REQUIRED) pkg_config_library(LIBGIT2 libgit2 REQUIRED)
set(LIBGIT2_LIBRARIES "") set(LIBGIT2_LIBRARIES "")
if(ANDROID) if(ANDROID)
# for Android we need to force a static link against ssl and crypto # for Android we need to force a static link against ssl and crypto
# this is a bit hacky, but it seems to work # 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) set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} ${LIBGIT2_LIBRARY_DIRS}/libssl.a ${LIBGIT2_LIBRARY_DIRS}/libcrypto.a)
endif() endif()
if(FORCE_LIBSSH) if(FORCE_LIBSSH)
pkg_config_library(LIBSSH2 libssh2 REQUIRED) pkg_config_library(LIBSSH2 libssh2 REQUIRED)
set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} ${LIBSSH2_LIBRARIES}) set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} ${LIBSSH2_LIBRARIES})
endif() endif()
else() else()
find_package(LIBGIT2 REQUIRED) find_package(LIBGIT2 REQUIRED)
include_directories(${LIBGIT2_INCLUDE_DIR}) include_directories(${LIBGIT2_INCLUDE_DIR})
if(FORCE_LIBSSH) if(FORCE_LIBSSH)
find_package(Libssh2 QUIET CONFIG) find_package(Libssh2 QUIET CONFIG)
if ("${LIBSSH2_VERSION}" STRGREATER "1.6.1") if ("${LIBSSH2_VERSION}" STRGREATER "1.6.1")
set(LIBSSH2_LIBRARIES Libssh2::libssh2) set(LIBSSH2_LIBRARIES Libssh2::libssh2)
endif() endif()
if(!LIBSSH2_FOUND OR "${LIBSSH2_FOUND}" STREQUAL "") if(!LIBSSH2_FOUND OR "${LIBSSH2_FOUND}" STREQUAL "")
pkg_config_library(LIBSSH2 libssh2 REQUIRED) pkg_config_library(LIBSSH2 libssh2 REQUIRED)
endif() endif()
endif() endif()
find_package(libcurl QUIET) find_package(libcurl QUIET)
if(!LIBCURL_FOUND OR "${LIBCURL_FOUND}" STREQUAL "") if(!LIBCURL_FOUND OR "${LIBCURL_FOUND}" STREQUAL "")
pkg_config_library(LIBCURL libcurl REQUIRED) pkg_config_library(LIBCURL libcurl REQUIRED)
endif() endif()
set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} -L${LIBSSH2_LIBRARY_DIRS} ${LIBSSH2_LIBRARIES} ${LIBCURL_LIBRARIES}) set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} -L${LIBSSH2_LIBRARY_DIRS} ${LIBSSH2_LIBRARIES} ${LIBCURL_LIBRARIES})
endif() endif()