miniupnpc API version 14 changed the upnpDiscover functions, adding an argument for TTL (should default to 2)

this enables support for that should the build system have that specific version installed, the miniupnpc bundled in the project is unchanged
This commit is contained in:
Marisa Kirisame
2015-09-29 23:10:31 +02:00
parent 16957fcaec
commit 8c5744bca7
3 changed files with 42 additions and 6 deletions

View File

@ -690,9 +690,12 @@ if(USE_UPNP)
if(NOT APPLE AND NOT ANDROID)
include(FindMiniupnpc)
endif()
if(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER)
if(MINIUPNP_FOUND AND (MINIUPNPC_VERSION_1_7_OR_HIGHER OR MINIUPNPC_VERSION_API14_OR_HIGHER))
message("Using shared miniupnpc")
include_directories(${MINIUPNP_INCLUDE_DIR})
if (MINIUPNPC_VERSION_API14_OR_HIGHER)
add_definitions(-DUPNPDISCOVER_HAS_TTL)
endif()
else()
message("Using static miniupnpc from Externals")
add_subdirectory(Externals/miniupnpc)