CMake: update new location of in-tree miniupnpc

(cherry picked from commit b16a282f97d8f6c967e8a0b1ecfd75110f095182)

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)

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"