nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: update new location of in-tree miniupnpc

Browse Source 
(cherry picked from commit b16a282f97d8f6c967e8a0b1ecfd75110f095182)
This commit is contained in:
anonimal 2018-04-19 08:47:10 +00:00
parent f21df05c77
commit 859db52fda
No known key found for this signature in database
GPG Key ID: 66A76ECF914409F1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
external/CMakeLists.txt vendored
View File

@ -55,10 +55,10 @@ else()
if(STATIC) if(STATIC)
message(STATUS "Using miniupnpc from local source tree for static build") message(STATUS "Using miniupnpc from local source tree for static build")
else() else()
message(STATUS "Using miniupnpc from local source tree (/external/miniupnpc)") message(STATUS "Using miniupnpc from local source tree (/external/miniupnp/miniupnpc)")
endif() endif()
add_subdirectory(miniupnpc) add_subdirectory(miniupnp/miniupnpc)
set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
if(MSVC) if(MSVC)

6
src/p2p/net_node.inl
View File

@ -51,9 +51,9 @@
// We have to look for miniupnpc headers in different places, dependent on if its compiled or external // We have to look for miniupnpc headers in different places, dependent on if its compiled or external
#ifdef UPNP_STATIC #ifdef UPNP_STATIC
#include <miniupnpc/miniupnpc.h> #include <miniupnp/miniupnpc/miniupnpc.h>
#include <miniupnpc/upnpcommands.h> #include <miniupnp/miniupnpc/upnpcommands.h>
#include <miniupnpc/upnperrors.h> #include <miniupnp/miniupnpc/upnperrors.h>
#else #else
#include "miniupnpc.h" #include "miniupnpc.h"
#include "upnpcommands.h" #include "upnpcommands.h"