Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
54554757
Commit
54554757
authored
Mar 29, 2018
by
Etienne Samson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: make our preferred backend ordering consistent
parent
e3d764a4
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
src/CMakeLists.txt
+6
-3
No files found.
src/CMakeLists.txt
View file @
54554757
...
@@ -133,6 +133,8 @@ ELSE ()
...
@@ -133,6 +133,8 @@ ELSE ()
ENDIF
()
ENDIF
()
IF
(
USE_HTTPS
)
IF
(
USE_HTTPS
)
# We try to find any packages our backends might use
FIND_PACKAGE
(
OpenSSL
)
FIND_PACKAGE
(
mbedTLS
)
FIND_PACKAGE
(
mbedTLS
)
IF
(
CMAKE_SYSTEM_NAME MATCHES
"Darwin"
)
IF
(
CMAKE_SYSTEM_NAME MATCHES
"Darwin"
)
FIND_PACKAGE
(
Security
)
FIND_PACKAGE
(
Security
)
...
@@ -150,10 +152,13 @@ IF (USE_HTTPS)
...
@@ -150,10 +152,13 @@ IF (USE_HTTPS)
ENDIF
()
ENDIF
()
ELSEIF
(
WINHTTP
)
ELSEIF
(
WINHTTP
)
SET
(
HTTPS_BACKEND
"WinHTTP"
)
SET
(
HTTPS_BACKEND
"WinHTTP"
)
ELSEIF
(
OPENSSL_FOUND
)
SET
(
HTTPS_BACKEND
"OpenSSL"
)
ELSEIF
(
MBEDTLS_FOUND
)
ELSEIF
(
MBEDTLS_FOUND
)
SET
(
HTTPS_BACKEND
"mbedTLS"
)
SET
(
HTTPS_BACKEND
"mbedTLS"
)
ELSE
()
ELSE
()
SET
(
HTTPS_BACKEND
"OpenSSL"
)
MESSAGE
(
FATAL_ERROR
"Unable to autodetect a usable HTTPS backend."
"Please pass the backend name explicitly (-DUSE_HTTPS=backend)"
)
ENDIF
()
ENDIF
()
ELSE
()
ELSE
()
# Backend was explicitly set
# Backend was explicitly set
...
@@ -177,8 +182,6 @@ IF (USE_HTTPS)
...
@@ -177,8 +182,6 @@ IF (USE_HTTPS)
LIST
(
APPEND LIBGIT2_LIBS
${
COREFOUNDATION_LIBRARIES
}
${
SECURITY_LIBRARIES
}
)
LIST
(
APPEND LIBGIT2_LIBS
${
COREFOUNDATION_LIBRARIES
}
${
SECURITY_LIBRARIES
}
)
LIST
(
APPEND LIBGIT2_PC_LIBS
${
COREFOUNDATION_LDFLAGS
}
${
SECURITY_LDFLAGS
}
)
LIST
(
APPEND LIBGIT2_PC_LIBS
${
COREFOUNDATION_LDFLAGS
}
${
SECURITY_LDFLAGS
}
)
ELSEIF
(
HTTPS_BACKEND STREQUAL
"OpenSSL"
)
ELSEIF
(
HTTPS_BACKEND STREQUAL
"OpenSSL"
)
FIND_PACKAGE
(
OpenSSL
)
IF
(
NOT OPENSSL_FOUND
)
IF
(
NOT OPENSSL_FOUND
)
MESSAGE
(
FATAL_ERROR
"Asked for OpenSSL TLS backend, but it wasn't found"
)
MESSAGE
(
FATAL_ERROR
"Asked for OpenSSL TLS backend, but it wasn't found"
)
ENDIF
()
ENDIF
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment