Thomas Winget
8e3347f310
Pull blockchain changes into berkeleydb branch
2015-03-17 19:52:53 -04:00
Thomas Winget
6e9e8ab620
Move db_drivers/ to external/
...
Also change LMDB Cmake variables to CACHE rather than upgrading them
through several parent scopes.
2015-03-17 18:55:24 -04:00
Riccardo Spagni
56a1bf527b
fixed BUILD_64 option
2015-03-17 18:26:58 -04:00
Riccardo Spagni
c97a685a37
fixed arch_width option
2015-03-17 18:26:48 -04:00
Riccardo Spagni
3a3c07c330
fixed msys2 / mingw folders based on architecture, added license to unbound CMakeList as that is not part of standard Unbound
2015-03-17 18:26:38 -04:00
Riccardo Spagni
3b3da86483
moved 32-bit/64-bit detection into main CMakeLists
2015-03-17 18:26:29 -04:00
Thomas Winget
11e815761f
Revert "Moved db_drivers/ into external/ for consistency"
...
This reverts commit b21335642e
2015-03-17 18:03:11 -04:00
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
b21335642e
Moved db_drivers/ into external/ for consistency
2015-03-09 15:48:46 -04:00
warptangent
84fe5fbd65
Add compile-time support for both db implementations: in-memory and LMDB
...
Usage:
default is lmdb for blockchain branch:
$ make release
same as:
$ DATABASE=lmdb make release
for original in-memory implementation:
$ DATABASE=memory make release
2015-02-02 11:53:09 -08:00
warptangent
79ea1f6ff0
Merge upstream
...
Merge branch 'monero-project/master' into blockchain
2015-01-30 16:19:22 -08:00
Riccardo Spagni
2b3b70a261
remove aes flag, detect no sse2
2015-01-27 09:05:47 +02:00
Riccardo Spagni
bb85fea35a
fixed AES support flag
2015-01-27 07:45:21 +02:00
Riccardo Spagni
615079e2f4
allow for explicitly disabling AES-NI
2015-01-26 23:19:53 +02:00
Thomas Winget
34883599bc
Add in-source lmdb to build process
...
Working on Linux, needs verified for other platforms but should be fine.
2015-01-18 18:30:31 -05:00
moneromooo-monero
0886183568
build: add liblmdb to the cmake autodetection system
...
update for rebase (warptangent 2015-01-04)
src/cryptonote_core/CMakeLists.txt (edit)
- replace LMDB_LIBRARIES with LMDB_LIBRARY set from autodetection
2015-01-04 19:39:40 -08:00
Thomas Winget
1240cf805b
BlockchainDB unit tests, lmdb linker flag
...
Some BlockchainDB unit testing fleshed out (and working), rudimentary
linker flag for lmdb in CMakeLists, but should probably be done
"correctly" at some point (find it on whatever system you're building on
and all that jazz).
update for rebase (warptangent 2015-01-04)
fix conflicts with upstream CMakeLists.txt files
tests/CMakeLists.txt (remove edits from original commit)
2015-01-04 19:00:31 -08:00
Riccardo Spagni
f4b69d553a
year updated in license
2015-01-02 18:52:46 +02:00
Riccardo Spagni
affde29754
moved rapidjson to external folder, fixed CMake
2014-12-01 21:15:50 +02:00
Riccardo Spagni
4cd15cdde5
Merge pull request #1
...
f1eaf8870971be031ca231f833dc0bd88ff09a659e
2014-12-01 20:15:06 +02:00
Riccardo Spagni
685dd4a5d3
don't build tests unless we're building all-* or *-test builds
2014-12-01 20:00:22 +02:00
Ben Boeckel
ce71c01f11
cmake: work around a bug with implicit link directories
...
Unfortunately, this is necessary because CMake doesn't detect whether
mingw libraries are static or shared and doesn't put a -static flag around
the -lfoo argument which then makes the shared library be linked to.
2014-11-18 17:04:47 -05:00
Ben Boeckel
18c56abe4b
msys: don't use LTO
...
This causes duplicate symbol errors on msys' mingw install.
2014-11-17 18:19:54 -05:00
Ben Boeckel
5680c9cac7
msys: factor out -Werror on msys
...
There are Windows-related warnings turned into errors here.
2014-11-17 18:19:54 -05:00
Ben Boeckel
475154255a
msys: look in msys' directory for files
...
This tells find_path and find_library to look under this directory first
which is what we want on msys2.
2014-11-17 18:19:53 -05: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
9689df925c
cmake: clean up EXTRA_LIBRARIES
...
pthread is handled by CMAKE_THREAD_LIBS_INIT while libdl isn't needed.
2014-10-23 16:42:35 -04:00
Ben Boeckel
3b7bdcb790
cmake: set the project name
2014-10-23 16:42:35 -04:00
Ben Boeckel
0f0efc4af2
cmake: prepend to CMAKE_MODULE_PATH
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
475fe209a8
cmake: minor cleanups (indentation and typos)
2014-10-23 16:42:35 -04:00
Ben Boeckel
799e8b241f
cmake: use option() for STATIC
2014-10-23 16:42:35 -04:00
Ben Boeckel
c24d22b44e
cmake: clean up if auto-dereferencing
...
CMake will auto-dereference variable names in if statements, so there's
no need to dereference them manually.
2014-10-23 16:42:35 -04:00
Ben Boeckel
eba180a1c7
cmake: support git info in released tarballs
2014-10-23 16:42:34 -04:00
Ben Boeckel
eeffac6839
cmake: fix up BOOST_IGNORE_SYSTEM_PATHS
...
The option was set twice when it only needs to be set once. Also fix a
bogus dereference and spurious whitespace.
2014-10-23 16:42:34 -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
Oran Juice
09a659edb5
Stores seed language in wallet file. added rapidjson. Yet to test backward compatibility
2014-10-18 02:21:37 +05:30
Riccardo Spagni
26728d94fe
mingw library tweaks
2014-10-06 22:34:44 +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
b05e27f8b1
need to link with -ldl on Linux when building statically
2014-10-06 21:17:31 +02:00
Riccardo Spagni
1afba7311e
quieten CMake when it can't find packages
2014-10-06 18:56:59 +02:00
Riccardo Spagni
6b7ac4b37f
enforce static libraries when building statically
2014-10-06 18:46:18 +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
99945a5c47
dependencies enforced, send que error message log level moved
2014-09-29 20:13:15 +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
bff1f9d4c4
redo FindUnbound.cmake
2014-09-24 20:38:24 +02:00
Thomas Winget
24f325a33d
Fixed artifacts from cherry-picking devel->master
2014-09-23 22:59:47 +02:00
Thomas Winget
5bd343778f
Fixed CMake search for libunbound
...
As it turns out, some of CMake's built-in modules for detecting headers
and libraries don't work if you have certain compiler flags set, such as
-Werror=old-style-definition, as they do "int main()" rather than
"int main(void)". Having CMake search for libs before compiler flags
are set alleviates this issue, and I believe the underlying issue will
be fixed in future releases of CMake.
2014-09-23 22:58:31 +02:00
Thomas Winget
dea98df6b1
Updated CMake files -- added libunbound linker flag
...
CMake config file written, but was unable to test/get it working
properly because of a bug in CMake with functions related to
find_package. Simple "-lunbound" flag used in its stead for now. May
not build on non-Linux systems, not sure yet.
2014-09-23 22:58:02 +02:00
