Commit Graph

48 Commits

Author SHA1 Message Date
Thomas Winget
cade0da8f1
CMake wiring, minor cleanup, minor test addition
Make Cmake things aware of BerkeleyDB and BlockchainBDB

Make the BlockchainDB unit tests aware of BlockchainBDB
2015-03-16 04:17:53 -04:00
Thomas Winget
8b82f3c57f
Build fixed, goofed up some CMake
Forgot that CMake vars set to PARENT_SCOPE will still vanish if that
parent scope goes...out of scope.  LMDB vars elevated one more scope to
compensate for moving db_drivers/ into external/
2015-03-10 12:51:23 -04:00
Thomas Winget
b21335642e
Moved db_drivers/ into external/ for consistency 2015-03-09 15:48:46 -04:00
Thomas Winget
767aac274b Remove unused dependency 2015-01-04 19:31:20 -08:00
Thomas Winget
90d6f8bf62 Adding libglim as an external library
libglim is an Apache-licensed C++ wrapper for lmdb, and rather than
rolling our own it seems prudent to use it.

Note: lmdb is not included in it, and unless something happens as did
with libunbound, should be installed via each OS' package manager or
equivalent.
2015-01-04 18:41:44 -08:00
Riccardo Spagni
f4b69d553a
year updated in license 2015-01-02 18:52:46 +02:00
Riccardo Spagni
831933425b
update unbound from upstream 2014-12-04 23:10:49 +02:00
Riccardo Spagni
affde29754
moved rapidjson to external folder, fixed CMake 2014-12-01 21:15:50 +02:00
Ben Boeckel
de4fc40576 mingw: copy required libraries to the build tree
These are found as shared libraries and need to be copied so that PATH
manipulation isn't necessary outside of an msys shell.
2014-11-18 17:03:14 -05:00
Ben Boeckel
d855fe4e89 miniupnpc: bump the _POSIX_C_SOURCE feature macro
FreeBSD doesn't expose IPv6 structures without this.
2014-11-10 11:13:15 -05:00
Ben Boeckel
c696492549 unbound: fix getaddrinfo detection for 32-bit windows
On Windows, getaddrinfo is part of the Windows API and as such is
__stdcall, not __cdecl, so check_function_exists fails because the
declaration doesn't match the mangling __stdcall has. Instead, use a
header to include the symbol as declared on the system and use
check_symbol_exists instead.

Tested-By: greatwolf on IRC
2014-10-24 17:40:52 -04:00
Ben Boeckel
4b6515cfb5 unbound: fix type checking 2014-10-24 15:30:44 -04:00
Ben Boeckel
d43a20f8f4 unbound: plumb the libdir up
This is necessary for static builds where the linking is passed around
to dependent targets, but the library is lost.
2014-10-24 15:29:56 -04:00
Ben Boeckel
7d708e4223 cmake: support 2.8.7
Older versions of CMake support LINK_{PUBLIC,PRIVATE} while newer
versions prefer PUBLIC and PRIVATE instead, but still support the LINK_
prefix.
2014-10-24 15:29:51 -04:00
Ben Boeckel
031e3da724 cmake: remove scream-make (all-caps functions) 2014-10-23 16:42:35 -04:00
Ben Boeckel
abbd5c0bdb unbound: import cmake build system 2014-10-23 16:42:35 -04:00
Ben Boeckel
e59b5b7078 miniupnpc: clean up build system
Changes:

  - remove amiga and solaris conditionals
  - remove -fPIC hackery (use POSITION_INDEPENDENT_CODE instead)
  - remove tests
  - retab
2014-10-23 16:42:35 -04:00
Ben Boeckel
475fe209a8 cmake: minor cleanups (indentation and typos) 2014-10-23 16:42:35 -04:00
Ben Boeckel
a43f1a88d8 cmake: remove configuration variables
CMAKE_BUILD_TYPE is meant for single-config build tools (e.g., make and
ninja) while CMAKE_CONFIGURATION_TYPES is meant for multi-config build
tools (e.g., Xcode and Visual Studio). They should not be mixed or
manually set.
2014-10-23 16:42:34 -04:00
Ben Boeckel
a87ce09461 cmake: factor out error messages
Instead of using BoldRed and ColourReset everywhere, wrap it up in a
function.
2014-10-23 16:42:34 -04:00
Ben Boeckel
9aa48b6c50 miniupnpc: clear out else/endfoo command arguments 2014-10-23 16:42:34 -04:00
Riccardo Spagni
7c1d3b5090
fixed miniupnpc dynamic target 2014-10-06 23:54:48 +02:00
Riccardo Spagni
2cf94c1321
fix for mingw not playing nicely with libunbound configure, fix for correctly finding static libs on various operating systems 2014-10-06 22:29:07 +02:00
Riccardo Spagni
e55982a892
set the winsock variable differently on Windows 2014-10-06 19:40:53 +02:00
Riccardo Spagni
0586a27a13
fixed configure_command for libunbound under mingw 2014-10-06 19:19:47 +02:00
Riccardo Spagni
f8fd03602c
turns out mingw does actually produce .a libs and not .dll.a 2014-10-06 19:17:40 +02:00
Riccardo Spagni
1afba7311e
quieten CMake when it can't find packages 2014-10-06 18:56:59 +02:00
Riccardo Spagni
735a017bb3
removed required flags from miniupnp and unbound 2014-10-06 18:51:03 +02:00
Riccardo Spagni
5829b35147 include openssl in linbunbound static linking, added errors for openssl and expat 2014-10-06 18:08:33 +02:00
Riccardo Spagni
c70fa8689f reference the correct unbound static lib 2014-10-06 18:08:33 +02:00
Riccardo Spagni
954a244afe added libtool's install command 2014-10-06 18:08:33 +02:00
Riccardo Spagni
fd52015a2d use the correct CMake variable for static builds 2014-10-06 18:08:33 +02:00
Riccardo Spagni
cc0f6a6080 build libunbound correctly 2014-10-06 18:08:32 +02:00
Riccardo Spagni
8c00098c75 fix missing parentheses 2014-10-06 18:08:32 +02:00
Riccardo Spagni
cee87473ad build libunbound from external if no local libunbound or for static builds 2014-10-06 18:08:32 +02:00
Riccardo Spagni
9ef094b356
added unbound to external deps 2014-10-05 23:44:31 +02:00
Riccardo Spagni
fce9dea1b9
fix for miniupnpc static compile under Windows 2014-10-05 20:22:14 +02:00
Riccardo Spagni
18281f4d20 remove dangling upnp port mappings, updated miniupnpc 2014-10-02 18:54:55 +02:00
Riccardo Spagni
dda5a03146
fixed FreeBSD miniupnpc niggly 2014-09-24 21:23:23 +02:00
Riccardo Spagni
524eae58cc
never use the baked-in miniupnpc on FreeBSD because explosions 2014-09-24 20:57:09 +02:00
Riccardo Spagni
d34f681ed6
fixed miniupnpc static building 2014-09-21 02:23:28 +02:00
fluffypony
b35c1e2491 fixed UPNP_LIBRARIES scope 2014-09-11 13:28:49 +02:00
fluffypony
d21cf293e1 added license to CMake 2014-09-11 08:25:07 +02:00
fluffypony
36c7ea9f77 more CMake tweaks to allow detection on OS X 2014-09-11 08:22:49 +02:00
fluffypony
8d8b47e69f more dynamic miniupnp fixes 2014-09-10 20:01:30 +02:00
fluffypony
7d01dad8f4 use external miniupnpc if available 2014-09-10 18:14:57 +02:00
fluffypony
5a65991480 exclude local miniupnpc for FreeBSD, install from ports instead 2014-09-09 14:03:42 +02:00
Antonio Juarez
9682a15400 Port mapping with UPnP 2014-04-09 13:14:35 +01:00