Merge pull request #128 from fluffypony/master

fixed UPNP_LIBRARIES scope
This commit is contained in:
Riccardo Spagni 2014-09-11 13:30:24 +02:00
commit 8779a6da39

View file

@ -200,7 +200,11 @@ IF(MINIUPNPC_VERSION_PRE1_7)
ENDIF() ENDIF()
IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7) IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7)
IF(MINIUPNPC_VERSION_1_5_OR_HIGHER)
message(STATUS "Found miniupnpc version is v1.5 or higher")
ELSE()
message(STATUS "Found miniupnpc version is v1.7 or higher") message(STATUS "Found miniupnpc version is v1.7 or higher")
ENDIF()
ENDIF() ENDIF()
else () else ()
@ -234,5 +238,5 @@ else()
endif() endif()
set(UPNP_STATIC true PARENT_SCOPE) set(UPNP_STATIC true PARENT_SCOPE)
set(UPNP_LIBRARIES "upnpc-static") set(UPNP_LIBRARIES "upnpc-static" PARENT_SCOPE)
endif() endif()