Changeset 096682c in subsurface


Ignore:
Timestamp:
Jul 3, 2017, 1:48:54 PM (6 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
d7b8ad7
Parents:
6012351
Message:

Whitespace

Signed-off-by: Dirk Hohndel <dirk@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cmake/Modules/HandleFindGit2.cmake

    r6012351 r096682c  
    33        pkg_config_library(LIBGIT2 libgit2 REQUIRED)
    44        set(LIBGIT2_LIBRARIES "")
    5         if(ANDROID)
    6                 # for Android we need to force a static link against ssl and crypto
    7                 # this is a bit hacky, but it seems to work
    8                 set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} ${LIBGIT2_LIBRARY_DIRS}/libssl.a ${LIBGIT2_LIBRARY_DIRS}/libcrypto.a)
    9         endif()
    10         if(FORCE_LIBSSH)
    11                 pkg_config_library(LIBSSH2 libssh2 REQUIRED)
    12                 set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} ${LIBSSH2_LIBRARIES} -lcrypto)
    13         endif()
     5        if(ANDROID)
     6                # for Android we need to force a static link against ssl and crypto
     7                # this is a bit hacky, but it seems to work
     8                set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} ${LIBGIT2_LIBRARY_DIRS}/libssl.a ${LIBGIT2_LIBRARY_DIRS}/libcrypto.a)
     9        endif()
     10        if(FORCE_LIBSSH)
     11                pkg_config_library(LIBSSH2 libssh2 REQUIRED)
     12                set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} ${LIBSSH2_LIBRARIES} -lcrypto)
     13        endif()
    1414else()
    1515        find_package(LIBGIT2 REQUIRED)
    1616        include_directories(${LIBGIT2_INCLUDE_DIR})
    17         if(FORCE_LIBSSH)
    18                 find_package(Libssh2 QUIET CONFIG)
     17        if(FORCE_LIBSSH)
     18                find_package(Libssh2 QUIET CONFIG)
    1919                if ("${LIBSSH2_VERSION}" STRLESS "1.7" AND "${LIBSSH2_VERSION}" STRGREATER "1.6.1")
    20                         set(LIBSSH2_LIBRARIES Libssh2::libssh2)
    21                 endif()
     20                        set(LIBSSH2_LIBRARIES Libssh2::libssh2)
     21                endif()
    2222                # at least on my Mac I get the mixed case variable instead...
    2323                if(Libssh2_FOUND)
    2424                        set(LIBSSH2_FOUND ${Libssh2_FOUND})
    2525                endif()
    26                 if(!LIBSSH2_FOUND OR "${LIBSSH2_FOUND}" STREQUAL "")
    27                         pkg_config_library(LIBSSH2 libssh2 REQUIRED)
    28                 endif()
    29         endif()
    30         find_package(libcurl QUIET)
    31         if(!LIBCURL_FOUND OR "${LIBCURL_FOUND}" STREQUAL "")
    32                 pkg_config_library(LIBCURL libcurl REQUIRED)
    33         endif()
     26                if(!LIBSSH2_FOUND OR "${LIBSSH2_FOUND}" STREQUAL "")
     27                        pkg_config_library(LIBSSH2 libssh2 REQUIRED)
     28                endif()
     29        endif()
     30        find_package(libcurl QUIET)
     31        if(!LIBCURL_FOUND OR "${LIBCURL_FOUND}" STREQUAL "")
     32                pkg_config_library(LIBCURL libcurl REQUIRED)
     33        endif()
    3434        if("${LIBSSH2_LIBRARY_DIRS}" STREQUAL "")
    3535                set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} ${LIBSSH2_LIBRARIES} ${LIBCURL_LIBRARIES} -lcrypto)
Note: See TracChangeset for help on using the changeset viewer.