Merge pull request #2399

d0bbc591 Only check for upnp version if version is determined (Orestis Konstantinidis)

cmake/FindMiniupnpc.cmake

@@ -46,13 +46,13 @@ IF(MINIUPNPC_FOUND)
   file(STRINGS "${MINIUPNP_INCLUDE_DIR}/miniupnpc.h" MINIUPNPC_API_VERSION_STR REGEX "^#define[\t ]+MINIUPNPC_API_VERSION[\t ]+[0-9]+")
   if(MINIUPNPC_API_VERSION_STR MATCHES "^#define[\t ]+MINIUPNPC_API_VERSION[\t ]+([0-9]+)")
     set(MINIUPNPC_API_VERSION "${CMAKE_MATCH_1}")
+	if (${MINIUPNPC_API_VERSION} GREATER "10" OR ${MINIUPNPC_API_VERSION} EQUAL "10")
+		message(STATUS "Found miniupnpc API version " ${MINIUPNPC_API_VERSION})
+		set(MINIUPNP_FOUND true)
+		set(MINIUPNPC_VERSION_1_7_OR_HIGHER true)
+	endif()
   endif()
 
- if (${MINIUPNPC_API_VERSION} GREATER "10" OR ${MINIUPNPC_API_VERSION} EQUAL "10")
-	message(STATUS "Found miniupnpc API version " ${MINIUPNPC_API_VERSION})
-	set(MINIUPNP_FOUND true)
-	set(MINIUPNPC_VERSION_1_7_OR_HIGHER true)
-  endif()
 ENDIF()
 
 mark_as_advanced(MINIUPNP_INCLUDE_DIR MINIUPNP_LIBRARY MINIUPNP_STATIC_LIBRARY)