diff options
| author | anonimal <anonimal@i2pmail.org> | 2018-04-19 08:47:10 +0000 |
|---|---|---|
| committer | anonimal <anonimal@i2pmail.org> | 2018-04-19 10:56:09 +0000 |
| commit | 859db52fdabaf4fff07e0556861ab3cf915297ba (patch) | |
| tree | 7d933c81d72d897b246d4ccecadb879cf691a00e | |
| parent | Build: add miniupnp submodule (diff) | |
| download | monero-859db52fdabaf4fff07e0556861ab3cf915297ba.tar.xz | |
CMake: update new location of in-tree miniupnpc
(cherry picked from commit b16a282f97d8f6c967e8a0b1ecfd75110f095182)
| -rw-r--r-- | external/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/p2p/net_node.inl | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 69dc84e87..b4f712ee6 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -55,10 +55,10 @@ else() if(STATIC) message(STATUS "Using miniupnpc from local source tree for static build") else() - message(STATUS "Using miniupnpc from local source tree (/external/miniupnpc)") + message(STATUS "Using miniupnpc from local source tree (/external/miniupnp/miniupnpc)") endif() - add_subdirectory(miniupnpc) + add_subdirectory(miniupnp/miniupnpc) set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") if(MSVC) diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index 3b0d1c394..76340a22b 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -51,9 +51,9 @@ // We have to look for miniupnpc headers in different places, dependent on if its compiled or external #ifdef UPNP_STATIC - #include <miniupnpc/miniupnpc.h> - #include <miniupnpc/upnpcommands.h> - #include <miniupnpc/upnperrors.h> + #include <miniupnp/miniupnpc/miniupnpc.h> + #include <miniupnp/miniupnpc/upnpcommands.h> + #include <miniupnp/miniupnpc/upnperrors.h> #else #include "miniupnpc.h" #include "upnpcommands.h" |