nulltoken
095bfd7487
cmake: Update Windows resources to reflect the optional vendor string
...
Make InternalName and OriginalFilename resources reflect the name of the compiled binary.
2013-05-22 00:15:13 +02:00
nulltoken
ccf1a2ba5f
cmake: Fix indentation
2013-05-22 00:15:12 +02:00
Vicent Martí
e3107e0ee1
Merge pull request #1558 from bmorganpa/ssh_transport
...
SSH Transport
2013-05-16 11:35:02 -07:00
Carlos Martín Nieto
3bbc87d697
CMake: allow appending a string to the library filename
...
This helps us install multiple versions of the library side-by-side.
2013-05-14 23:40:20 +02:00
Carlos Martín Nieto
000e68961c
CMake: don't try to use bundled zlib when the system's path is in the cache
...
The code surrounding zlib bundling did not take into consideration
that ZLIB_LIBRARY gets cached, and assumed that FIND(ZLIB) would
always set ZLIB_FOUND, which does not hold true, as this variable
signifies that we have found the package and had to look at the
system, as its location was not cached.
Only use the bundled sources if the external zlib is neither
newly-found nor cached.
2013-05-12 15:35:02 +02:00
Brad Morgan
00e43380a0
Merge remote-tracking branch 'origin/development' into ssh_transport
2013-05-07 14:30:35 -04:00
Brad Morgan
7369b3c3bf
Added libssh2 cmake module
2013-05-07 14:26:33 -04:00
Vicent Marti
b641c00eeb
clar: Always generate the test suite
2013-05-03 17:35:50 +02:00
Edward Thomson
ac1d85cf11
cmake 2.6 parser bug workaround
2013-04-29 11:00:05 -05:00
Edward Thomson
eb63fda2e2
git_atomic_ssize for 64-bit atomics only on 64-bit platforms
2013-04-25 12:40:33 -05:00
Ben Straub
ec7e240ba4
Add rev-list example to makefiles
2013-04-09 05:07:12 +04:00
Philip Kelley
2c7f7a66e9
http: Support 302 Found (arrbee did most of the work)
2013-03-25 17:35:36 -04:00
Vicent Marti
c2ea65eec3
clar: Disable online tests. By now.
2013-03-25 21:24:18 +01:00
QbProg
d66a7c061a
Fix for a cmake bug when using MSVC + Win64 + static libraries
...
(see http://public.kitware.com/Bug/view.php?id=11240 )
2013-03-17 10:48:41 +01:00
QbProg
08f32085ab
Adds an option to select the CRT link mode ( static or dynamic ).
...
This is useful when linking libgit2 statically, as the setting must match the linking program's one.
2013-03-17 10:48:34 +01:00
Carlos Martín Nieto
0887b580bf
Use C99 stdio in mingw-w64
...
MinGW >= 3.14 does this automatically, but mingw-64 wants us to define
it.
2013-03-08 15:30:18 +01:00
Vicent Martí
92ebbe99c9
Merge pull request #1399 from nathan-osman/development
...
Add SONAME build option to facilitate building for Android.
2013-03-07 12:06:18 -08:00
Edward Thomson
b5ec5430a8
optional tracing
2013-03-07 12:42:33 -06:00
Nathan Osman
e7da9acdcd
Added build option SONAME to control whether VERSION and SOVERSION were set for the git2 target, as some platforms require that this NOT be set.
2013-03-06 17:51:38 -08:00
Philip Kelley
69c28b75df
MSVC: Define NDEBUG to disable asserts in release builds
2013-03-06 13:22:50 -05:00
Philip Kelley
19be3f9e65
Improve MSVC compiler, linker flags
2013-02-13 16:01:14 -05:00
Vicent Martí
fb60d268df
Merge pull request #1315 from nulltoken/development
...
cMakeList: Prevent MSVCR1x0.dll dependency
2013-02-05 06:18:23 -08:00
nulltoken
e8670d01e0
cMakeList: Prevent MSVCR1x0.dll dependency
...
Deploys the libgit2/libgit2@9041250 fix to RELWITHDEBINFO
and MINSIZEREL build flavors
Fix #255
2013-02-05 14:32:09 +01:00
Edward Thomson
c27e211219
update examples to work on windows
2013-01-23 17:38:00 -06:00
Sebastian Bauer
b41e24a65c
Add -fPIC only if BUILD_SHARED_LIBS is ON
2013-01-10 09:20:43 +01:00
Sebastian Bauer
707ede8633
Compile regexp dependency when AMIGA is defined.
...
Before it was compiled when CMake was actually run on AmigaOS.
2013-01-10 09:19:11 +01:00
Sebastian Bauer
c57c4af327
Disable SSL when compiling for AmigaOS for now.
2013-01-10 09:16:39 +01:00
Edward Thomson
8f09f46498
remove ppc sha1 asm
2013-01-08 16:55:16 -06:00
Edward Thomson
d335e73a6a
keep comments at < 80 chars
2013-01-08 16:37:19 -06:00
nulltoken
09556895b7
travis: Include the online suite when running against Travis
2013-01-06 14:40:32 +01:00
Vicent Marti
4236164a77
Prototypes warning goes away
2013-01-03 02:37:28 +01:00
Vicent Marti
2e6f06a8d4
...and add Clar raw
2013-01-03 02:34:45 +01:00
Vicent Marti
afb181167e
/deal with it
2013-01-03 01:04:18 +01:00
Vicent Marti
39444bea0a
...fine
2013-01-03 01:01:03 +01:00
Vicent Marti
ad27838bdc
Proper submodule dependency
2013-01-03 00:58:46 +01:00
Vicent Marti
6443eaf22f
Disable Network suite by default
2013-01-03 00:50:29 +01:00
Vicent Marti
39cd01779c
This is a better name
2013-01-02 22:38:10 +01:00
Vicent Marti
a44f2e9e7b
Try it like this...
2013-01-02 22:26:34 +01:00
Vicent Marti
e229c04825
Fuck you CMake
2013-01-02 21:27:00 +01:00
Vicent Marti
0df4167577
Submodule checkout
2013-01-02 21:22:19 +01:00
Vicent Marti
a368fd0f79
Checkout test
2013-01-02 20:08:49 +01:00
Vicent Marti
5c2d3f6d5d
Add build dependency for clar. Also, fuck you CMake. Fuck you.
2013-01-02 04:19:13 +01:00
Vicent Marti
b0a4582975
Bump the Clar submodule
2013-01-02 02:05:11 +01:00
Vicent Marti
156cfec096
Cleanup Clar to make it SIMPLER
2013-01-02 02:05:11 +01:00
Sascha Cunz
523a3ae5a3
MSVC: Don't list all source files in an endless list
...
Instead tell MSVC to group the source files by directory.
2012-12-19 04:57:15 +01:00
Sascha Cunz
94243295b2
DRY: Add function that adds os-specific libraries to our targets
2012-12-19 04:57:14 +01:00
Sascha Cunz
19a766a201
Collect configuration options at the top of the file
...
- Also document the -DSTDCALL even better.
2012-12-19 04:57:13 +01:00
Sascha Cunz
521479b170
DRY: Don't repeat globs for libgit2's own source files
2012-12-19 04:57:12 +01:00
Sascha Cunz
c5309eb2da
Remove special case source globs for Solaris
...
With the src/compat/*.c glob removed, there is no longer a difference to
the default globs we use for the IF( UNIX ) case.
2012-12-19 04:57:12 +01:00
Sascha Cunz
49b630086e
Remove src/compat/*.c from source globs
...
This directory doesn't exist.
2012-12-19 04:57:11 +01:00
Sascha Cunz
b53671ae85
Search for zlib unconditional
...
Up to now, on windows we don't even bother to look if the user has a zlib
available somwhere.
In almost all larger commercial projects i've participated in, it was not
at all uncommon to have such a dependency somewhere in the source tree and
use it whereever required.
Searching for it, even if it's unlikely to be present, allows for such a
scenario (i.e. by prefilling the CMake-Cache).
2012-12-19 04:57:11 +01:00
Sascha Cunz
3d007f4f9c
DRY: Scan for regex.c only in one place
2012-12-19 04:57:10 +01:00
Sascha Cunz
8d45789167
Only add deps/http-parser to include-dirs if required
2012-12-19 04:57:09 +01:00
Vicent Marti
cfbe4be3fb
More external API cleanup
...
Conflicts:
src/branch.c
tests-clar/refs/branches/create.c
2012-11-27 13:18:27 -08:00
Russell Belfer
a9069f6154
Merge pull request #1086 from scunz/vs_warning_level
...
VS-Build: Append C_FLAGS to the end of the already given ones.
2012-11-19 12:11:01 -08:00
Sascha Cunz
4a03913cfb
VS-Build: Disable /W4 parameter, as it is not picked up anyway
...
My other PR revealed, that the /W4 parameter, we give to MSVC is ignored
because cmake set CMAKE_C_FLAGS already to /W3 and we overwrite it.
The command line tools gave me a D9025 warning for this on every file and
looking into the project properties page on MSVC 2008 tells, that it has
the warning level set to /W3.
However, the warnings introduced by /W4 are far to useless for having
them enabled. So just disable them.
2012-11-19 21:07:13 +01:00
Sascha Cunz
26d9e317db
Don't use precompiled headers for command-line based VC builds.
...
The reason, why libgit2 currently cannot support compiling via the command-line
tools cl/nmake from WinSDK and/or Microsoft Visual Studio, seems to be a
missing dependency on the generated precompiled header file.
The Visual Studio IDE automatically inserts this dependency when it sees the
right combination of "/Y" parameters.
This patch allows to compile using command line tools by disabling precompiled
headers for NON-IDE builds.
2012-11-19 05:00:02 +01:00
Edward Thomson
d6fb092409
Win32 CryptoAPI and CNG support for SHA1
2012-11-13 10:23:05 -06:00
Russell Belfer
dbd6850d06
Hide deprecations on MacOS
...
Why Apple, why?
2012-11-01 10:57:14 -07:00
Paul Thompson
88149fae9f
Leave CMAKE_BUILD_TYPE absent on those generators which don't use it.
2012-10-28 10:21:28 +11:00
Paul Thompson
4a3be934de
Removed overwrite of CMAKE_C_FLAGS_DEBUG.
...
- No overwriting allows control from cmake cache or cmdline
- -g is already the CMake default
- -O0 is already gcc's default
2012-10-28 09:56:18 +11:00
Paul Thompson
54c56d3efd
Remove "-O2 -g" from default CMAKE_C_FLAGS.
...
- Those are the RelWithDebInfo flags.
- They should be controlled from CMAKE_BUILD_TYPE
2012-10-28 09:42:54 +11:00
Paul Thompson
2df7c94490
Remove duplicate CMAKE_C_FLAGS inside CMAKE_C_FLAGS_DEBUG.
...
- For Debug builds, CMake uses concatenated
CMAKE_C_FLAGS and CMAKE_C_FLAGS_DEBUG
- This reverts commit 291f712292
.
2012-10-28 09:30:08 +11:00
Edward Thomson
94155e2fa2
remove /ZM1000 from msvc builds
2012-10-25 14:51:08 -05:00
Vicent Martí
81e7b10a15
Merge pull request #1012 from carlosmn/libcrypto-sha
...
Use libcrypto's SHA-1 implementation when linking to it
2012-10-23 13:43:28 -07:00
Carlos Martín Nieto
7205a4d94c
Use libcrypto's SHA-1 implementation when linking to it
...
libcryto's SHA-1 implementation is measurably better than the one that
ships with the library. If we link to it for HTTPS support already,
use that implementation instead.
Testing on a ~600MB of the linux repository, this reduces indexing
time by 40% and removes the hashing from the top spot in the perf
output.
2012-10-23 20:30:16 +02:00
Veeti Paananen
88e0fc05d6
Remove backwards compatibility for INSTALL_LIB
2012-10-20 02:59:40 +03:00
Veeti Paananen
291f712292
Let environment CFLAGS override the debug flags
2012-10-20 02:57:02 +03:00
Veeti Paananen
9795a40f88
Use standard CMake variable names for installation paths
...
Rename INSTALL_INC and INSTALL_BIN to INCLUDE_INSTALL_DIR and
BIN_INSTALL_DIR, which are more commonly used. This is also
consistent with the variable for the library path which is
already LIB_INSTALL_DIR.
2012-10-20 02:56:35 +03:00
Carlos Martín Nieto
a75770febc
tests: add a test for tag autofollow behaviour
...
Also tell ctest and valgrind to run libgit2_clar with '-iall' so we
run the network tests in travis.
2012-10-11 00:19:54 +02:00
Carlos Martín Nieto
3ce22c7485
http: use WinHTTP on Windows
...
Wondows has its own HTTP library. Use that one when possible instead of
our own.
As we don't depend on them anymore, remove the http-parser library from
the Windows build, as well as the search for OpenSSL.
2012-09-14 02:13:30 +02:00
Ignacio Casal Quinteiro
b3237ac313
Add support for the more standard LIB_INSTALL_DIR variable
2012-07-13 17:14:08 +02:00
Chris Young
abd6d52c72
revert defaults
2012-06-20 19:27:17 +01:00
Chris Young
17b45d801d
Removed hardcoded CMAKE_SYSTEM_NAME
2012-06-13 23:43:25 +01:00
Chris Young
a21bb1aa33
Merge remote-tracking branch 'source/development' into development
2012-06-13 23:28:51 +01:00
Chris Young
96ef3d8462
Make this more generic and mergeable.
...
Needs AmigaOS.cmake now from CMake package at OS4Depot, or contents below:
--8<--
SET(AMIGA 1)
SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
--8<--
2012-06-13 23:16:14 +01:00
Ben Straub
73aaf67439
Precompile headers for MSVC.
2012-06-13 14:28:47 -07:00
Chris Young
c9f79972ba
remove errorneous comment
2012-06-09 23:13:21 +01:00
Chris Young
c3fad0ae35
Merge branch 'development' of github.com:chris-y/libgit2 into development
2012-06-09 23:06:32 +01:00
Chris Young
41cbbea8fe
Let platform 'Generic' get the regex deps so we don't need to use our external ones
2012-06-09 23:05:59 +01:00
Chris Young
b9bfc7684b
pre-compiled sha1ppc.S.obj file with nasty CMake hack instructions as the cross-compile process refuses to build and link this file itself.
2012-06-09 17:33:08 +01:00
Chris Young
4c650c2b80
Don't use the PPC native SHA1 :( CMake is refusing to acknowledge the sha1ppc.S ppc asm code.
2012-06-08 19:55:04 +01:00
Chris Young
c3f7a9386d
Re-add the ability to select the PowerPC SHA1 function
2012-06-08 19:37:24 +01:00
Chris Young
fa56478fb8
Generic needs compat files
2012-06-08 19:15:11 +01:00
Chris Young
fb0b1523c4
force disable of openssl, confusing cross-compiler
2012-06-07 20:40:03 +01:00
Chris Young
c3f35902f3
Merge remote-tracking branch 'source/development' into update-test
...
Merging main libgit2!
Conflicts:
CMakeLists.txt
src/unix/map.c
2012-06-07 20:29:22 +01:00
Vicent Martí
966fbdcb8e
Merge pull request #697 from carlosmn/ssl
...
Add HTTPS support
2012-06-05 13:53:33 -07:00
Chris Young
cada414a80
OS4 is PPC
2012-06-05 12:07:08 +01:00
U-Poseidon\Chris
bad1505609
Force not to use openssl, as confusing cross-compiler
...
t to use openssl, as confusing cross-compiler
t to use openssl, as confusing cross-compiler
ss
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: CMakeLists.txt
2012-06-05 11:41:43 +01:00
Scott J. Goldman
2eb1844990
Refactor CMakeLists.txt for mingw cross-compile
...
Two things:
1) By default, Linux CMake puts -fPIC on the link line. So we remove that
for MINGW to avoid warnings that it will be ignored.
2) Similarly, move -fvisibility=hidden flag to be for non-mingw
compilation only to avoid warnings that it will be ignored.
2012-05-26 18:37:40 -07:00
Scott J. Goldman
62986ff6de
Add CMake build for examples / add them to Travis
...
By default, they are still not built, but hopefully, now that Travis is
building them, this will help stave off some of the bitrot.
2012-05-20 00:52:49 -07:00
Carlos Martín Nieto
d3e1367f61
ssl: remove GnuTLS support
...
It's too much work for now to redo everything.
Move the ssl context struct to transport.h
2012-05-19 17:51:53 +02:00
Carlos Martín Nieto
a6f24a5b3a
https: make it work with OpenSSL as well
...
Add specific functions that use OpenSSL instead of GnuTLS
2012-05-19 17:50:52 +02:00
Carlos Martín Nieto
66024c7cbc
http: add https support when GnuTLS is available
...
If it's not available, an error saying so will be returned when trying
to use a https:// URL.
This also unifies a lot of the network code to use git_transport in
many places instead of an socket descriptor.
2012-05-19 17:50:52 +02:00
Russell Belfer
706a9974a2
Basic setup for profiling
...
This fixes the examples so they will build and adds a PROFILE
option to the CMakeFile that enabled gprof info on non-Windows
2012-05-17 13:05:17 -07:00
Vicent Martí
72bfde9790
Merge pull request #681 from scottjg/solaris-fixes
...
Fix build/runtime issues on Solaris
2012-05-14 11:01:14 -07:00
Sascha Cunz
b15bef2301
Use -fvisibility=hidden in GCC builds
2012-05-12 11:12:42 +02:00
Scott J. Goldman
ec42eafd4a
Hook up Windows compat fnmatch() for Solaris
...
Since Solaris does not support some of the same flags as glibc fnmatch(),
we just use the implementation we have for Windows.
Now that it's no longer a windows-specific thing, I moved it into compat/
instead of win32/
2012-05-10 09:52:49 -07:00
Scott J. Goldman
901fbdad1b
Define explicit _WIN32_WINNT version in makefile
...
Previously, it was defined in netops.c, but it's also needed in one of the
clar tests, so I figured we might as well just make it global for the
whole project.
Without it, the mingw32 linker won't resolve GetProcessId() (called from
the core/errors.c clar test) because of some conditionals in windows.h.
2012-05-07 00:05:02 -07:00
Vicent Martí
16eaa15059
Merge pull request #606 from benstraub/t04_commit_to_clar
...
Ported t04_commit.c to Clar.
2012-04-02 17:24:16 -07:00