summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Get rid of libssh2 embedding"cmn/ssh-embed-againCarlos Martín Nieto2015-09-031-2/+13
| | | | | | | | The embedding was removed as a libssh2 release with Windows crypto support became available, but dependencies are still annoying so this ahs been requested again. This reverts commit 20dcb7315cd4c5760c68402998fd9e5a6bf5505d.
* CMake: fall back to OpenSSL on older OS Xcmn/old-securityCarlos Martín Nieto2015-08-191-2/+12
| | | | | | | | | | Starting at OS X 10.8, the Security framework offers some functions which are unified across OS X and iOS. These are the functions that we use. Older versions of OS X do not have these functions and we fail to compile. In these situations, fall back to using OpenSSL for our TLS stream instead.
* Forcing libssh2 lib locationSlava Karpenko2015-08-061-1/+1
| | | | OS X may have libssh2 in diff locations, so CHECK_LIBRARY_EXISTS may check the wrong lib; forcing it to use a found directory.
* Add -Wdocumentation flag if supportedBen Chatelain2015-07-271-0/+1
|
* Merge pull request #3292 from tkelman/patch-1Edward Thomson2015-07-111-1/+1
|\ | | | | Increase required version of cmake to 2.8
| * Increase required version of cmake to 2.8Tony Kelman2015-07-101-1/+1
| |
* | Include stacktrace summary in memory leak output.Jeff Hostetler2015-06-291-0/+1
|/
* CMake: treat the ld flags as a listCarlos Martín Nieto2015-06-281-10/+14
| | | | | | | | | These are treated as a list by CMake itself, which means that treating them as a simple string can put semicolons in our ld command-line if we have libraries which are not installed on the standard locations. Treat the variable as a CMake list and replace it with the space-delimited list just before writing it out to our pc file.
* pc: Put libcurl and libssh2 in Libs.privatecmn/link-one-levelCarlos Martín Nieto2015-06-261-3/+3
| | | | | | | | Pass on to whoever wants to link to libgit2 statically the flags that we would have used for these libraries. Putting them in Requires.private as we do now makes pkg-config put their dependencies in the linker arguments as well, which is not what we want.
* List `libcurl` in the generated `libgit2.pc`Arthur Schreiber2015-06-251-0/+1
|
* curl: find and link with the library if it's available by defaultCarlos Martín Nieto2015-06-241-0/+11
|
* Quote LIBSSH2_LIBRARIES callMarius Ungureanu2015-06-191-1/+1
| | | | | | | | Credits to @directhex It is possible for PKG_CHECK_MODULES(LIBSSH2 libssh2) to LIBSSH2_LIBRARIES to a string with more than one library in it - e.g. if your libssh2 was built against libgcrypt, it will be "ssh2;gcrypt" Quoting the string is needed, or CHECK_LIBRARY_EXISTS will fail.
* cmake: Add CMake check for libssh2 memory credential passing supportMichał Górny2015-05-271-0/+5
|
* Get rid of libssh2 embeddingcmn/remove-ssh-embedCarlos Martín Nieto2015-05-121-13/+2
| | | | | | | It was added as a workaround while the project had code to use WinCNG but had not made a release with it. There is now a release of libssh2 with WinCNG support, so this option is redundant. Let's get rid of it before people start liking it too much.
* Merge pull request #3086 from yongthecoder/masterCarlos Martín Nieto2015-05-061-3/+1
|\ | | | | Android build doesn't need deps/regex
| * Android build doesn't need deps/regexYong Li2015-05-041-3/+1
| | | | | | | | | | | | | | | | | | | | deps/regex was included in Android build because Android NDK 4 has a packaging bug and doesn't have the regular expression functions defined in its libc.so. The bug has been fixed in subsequent Android NDK releases. If it is still necessary to work around the bug in Android NDK 4, we should consider to use an option like ANDROID_NDK_RELEASE or ANDROID_NDK_RELEASE_NUM.
* | Ensure frameworks are mentioned in libgit2.pcArthur Schreiber2015-05-051-0/+2
|/ | | When building on Mac OS X, the `CoreFoundation` and `Security` frameworks where missing from `Libs.private` in the generated `libgit2.pc` file.
* Rename GIT_SSL to GIT_OPENSSLCarlos Martín Nieto2015-04-231-1/+1
| | | | | This is what it's meant all along, but now we actually have multiple implementations, it's clearer to use the name of the library.
* Add a SecureTransport TLS channelCarlos Martín Nieto2015-04-231-2/+28
| | | | | As an alternative to OpenSSL when we're on OS X. This one can actually take advantage of stacking the streams.
* Add MSVC CRTDBG memory leak reporting.Jeff Hostetler2015-04-151-0/+9
|
* Use swprintf_s everywhere except mingw.orgTony Kelman2015-03-191-2/+1
|
* use a different .def file for 64 bitTony Kelman2015-03-161-2/+8
|
* Fix out-of-tree buildTony Kelman2015-03-161-4/+6
| | | | link against crypt32 for CertFreeCertificateContext
* Win32: Enable WinHTTP for MinGWPhilip Kelley2015-03-161-5/+36
|
* Only run -ionline tests IF (WINHTTP OR OPENSSL_FOUND)Tony Kelman2015-03-051-1/+5
|
* Added cl_perf_timer. Updated global trace to include timers.Jeff Hostetler2015-03-021-1/+1
|
* Provide mechanism to let CLAR globally setup git_trace()Jeff Hostetler2015-03-021-1/+1
|
* Fix Mac build without OpenSSLLeo Yang2015-02-171-1/+2
| | | | | | | If OpenSSL is disabled on Mac the SHA1 implementation goes to the CommonCrypto from the system. In this case we should not include the generic hash impl. Otherwise there would be duplicated impls which fail the build.
* Merge pull request #2845 from rakuco/libssh2-detection-fixCarlos Martín Nieto2015-02-121-1/+2
|\ | | | | Add libssh2's library and include directories.
| * Add libssh2's library and include directories.Raphael Kubo da Costa2015-01-251-1/+2
| | | | | | | | | | | | | | | | | | | | Follow-up to 4f91bfa ("Find libssh2 via pkg-config"): FindPkgConfig sets <foo>_INCLUDE_DIRS, not <foo>_INCLUDE_DIR like FindLIBSSH2 did. Additionally, if using only FindPkgConfig to find libssh2, we have to call LINK_DIRECTORIES() as well to pass the appropriate -L entries, otherwise the build will only work if libssh2.so is in a directory searched automatically by the linker.
* | Tell user if libssh was not foundYury G. Kudryashov2015-02-041-0/+2
|/ | | | Fixes #2665
* Add option to turn off OpenSSLLeo Yang2015-01-131-1/+2
|
* cmake: include FindPkgConfig for windowsEdward Thomson2014-12-221-0/+1
| | | | | Apparently FindPkgConfig is not included by default on VS builds, only Unix and Unix-like (mingw) builds.
* Find libssh2 via pkg-configcmn/pkg-config-sshCarlos Martín Nieto2014-12-051-1/+1
| | | | | | We don't really need our own module to find libssh2. Using pkg-config lets the standard tool do the work for us and let us fit more naturally in the workflow as we respect the pkg-config search paths.
* Flip THREADSAFE's default to ONcmn/threadsafe-onCarlos Martín Nieto2014-10-271-1/+1
| | | | | | Threads are here to stay; and for a while now, users have had to call the initialization function which sets up threads and crypto regardless of whether the library was built threadsafe or not.
* Merge pull request #2647 from ethomson/clar_tmpnameEdward Thomson2014-10-241-0/+1
|\ | | | | clar: use a custom temp directory name
| * clar: use a custom temp directory nameEdward Thomson2014-10-241-0/+1
| |
* | hash: use CommonCrypto on OSX for SHA-1cmn/common-cryptoCarlos Martín Nieto2014-10-241-0/+1
|/ | | | | OSX has its own cryptographic library, let's make use of it instead of calling out to OpenSSL.
* Provide option to embed libssh2cmn/embed-sshCarlos Martín Nieto2014-10-051-2/+13
|
* Introduce proper http authentication APIEdward Thomson2014-08-151-1/+1
|
* Add GSSAPI support for SPNEGO/Kerberos auth over HTTPEdward Thomson2014-08-151-0/+11
|
* Change SOVERSION at API breakscmn/soversionCarlos Martín Nieto2014-06-081-1/+4
| | | | | | | | | | Since the SOVERSION doesn't need to follow the library's version and simply needs to be monotonically increasing whenever we release something that breaks the ABI, we can set some number and allow multiple versions of the library to be installed side-by-side. We start here with the minor version as that's what we release for now, and it allows to backport this change to earlier versions.
* cmake: s/ICONV/Iconv/ in FIND_PACKAGEJeff King2014-05-081-1/+1
| | | | | | | | | | | The cmake module we provide is in the file FindIconv.cmake, so we must match the case correctly. It happens to work in practice because we only turn on ICONV on Darwin, and people generally have case-insensitive filesystems there. Note that we only need to update the package name here. The package itself still sets the all-uppercase ICONV_FOUND flag, so we continue to use uppercase in the rest of cmake.
* Merge pull request #2304 from jacquesg/solarisVicent Marti2014-05-011-1/+5
|\ | | | | Solaris!
| * Build regex.c for Solaris. Added required defines for SolarisJacques Germishuys2014-04-301-1/+5
| |
* | Don't exclude libssh2 from MinGWcmn/known-libsCarlos Martín Nieto2014-04-301-1/+1
| | | | | | | | | | | | | | It reportedly works. It does not however work when cross-compiling on Travis, so let's disable it there. This fixes #2311.
* | Workaround missing .pc files on FreeBSDTing-Wei Lan2014-04-301-2/+6
| | | | | | | | This fixes #2118
* | Unquiet CMake outputCarlos Martín Nieto2014-04-301-8/+4
| | | | | | | | | | The point of this phase is to know what we have and not. Show the user a clear indication of what we have.
* | Make the build CMake 2.6 compatibleMarcin Sawicki2014-04-281-1/+1
|/
* Introduce AddCFlagIfSupported CMake macroJacques Germishuys2014-04-191-38/+9
|
View Lorry Controller Status