diff options
| author | Riccardo Spagni <ric@spagni.net> | 2014-09-24 20:57:09 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2014-09-24 20:57:09 +0200 |
| commit | 524eae58cce1ce22d8a2b0aacbdb567fca75de72 (patch) | |
| tree | ffc63a1bb1c60875798781be8e949d8c420b4e07 | |
| parent | fixed unbound libs in test (diff) | |
| download | monero-524eae58cce1ce22d8a2b0aacbdb567fca75de72.tar.xz | |
never use the baked-in miniupnpc on FreeBSD because explosions
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | external/CMakeLists.txt | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fcbd64ce4..5655bfc83 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -212,7 +212,5 @@ else() include_directories(${UPNP_INCLUDE}) endif() - - add_subdirectory(src) add_subdirectory(tests) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 177c2115e..f75c420ed 100755 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -216,7 +216,7 @@ 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 AND !STATIC) +if(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER AND !STATIC AND !FREEBSD) message(STATUS "Using shared miniupnpc found at ${MINIUPNP_INCLUDE_DIR}") set(UPNP_STATIC false PARENT_SCOPE) |