Merge upstream into blockchain

This commit is contained in:
Thomas Winget
2015-03-29 09:58:18 -04:00
7 changed files with 143 additions and 29 deletions

View File

@@ -35,7 +35,7 @@
# ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with
# others.
find_package(MiniUpnpc QUIET)
find_package(Miniupnpc QUIET)
# FreeBSD doesn't play well with the local copy, so default to using shared
set(USE_SHARED_MINIUPNPC false)