diff options
| author | Oran Juice <oranjuices@hotmail.com> | 2014-09-28 15:52:05 +0530 |
|---|---|---|
| committer | Oran Juice <oranjuices@hotmail.com> | 2014-09-28 15:52:05 +0530 |
| commit | 4f693d715c036346b642298cc94bd4d87c5f35e2 (patch) | |
| tree | c7f764d9f9d90de3947eff7910901ee3a56212b1 /external/CMakeLists.txt | |
| parent | Minor comment changes and code clean-up (diff) | |
| parent | Revert "low risk, potentially varint overflow bug patched thanks to BBR" (diff) | |
| download | monero-4f693d715c036346b642298cc94bd4d87c5f35e2.tar.xz | |
Merge with origin/master
Diffstat (limited to 'external/CMakeLists.txt')
| -rwxr-xr-x | external/CMakeLists.txt | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index fd8cd4eb7..f121162df 100755 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -216,7 +216,20 @@ MARK_AS_ADVANCED(MINIUPNP_INCLUDE_DIR MINIUPNP_LIBRARY) # And now on to the Monero part of things -if(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER) +# FreeBSD doesn't play well with the local copy +SET(USE_SHARED false) + +# If we have the correct shared version and we're not building static, use it +IF(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER AND !STATIC) + SET(USE_SHARED true) +ENDIF() + +# If we're on FreeBSD +IF(FREEBSD) + SET(USE_SHARED true) +ENDIF() + +if(USE_SHARED) message(STATUS "Using shared miniupnpc found at ${MINIUPNP_INCLUDE_DIR}") set(UPNP_STATIC false PARENT_SCOPE) |