cmake: Add libminiupnpc optional package support

CMakeLists.txt

@@ -48,6 +48,7 @@ option(THREADLOCAL "Enable features that depend on the C++ thread_local keyword
 include(TristateOption)
 tristate_option(CCACHE "Use ccache for compiling." "if ccache is found." AUTO)
 tristate_option(WITH_NATPMP "Enable NAT-PMP." "if libnatpmp is found." AUTO)
+tristate_option(WITH_MINIUPNPC "Enable UPnP." "if libminiupnpc is found." AUTO)
 
 if(CXX20)
   set(CMAKE_CXX_STANDARD 20)
@@ -143,6 +144,7 @@ message("Executables:")
 message("  bitcoind ............................ ${BUILD_DAEMON}")
 message("Optional packages:")
 message("  NAT-PMP ............................. ${WITH_NATPMP}")
+message("  UPnP ................................ ${WITH_MINIUPNPC}")
 message("")
 if(CMAKE_CROSSCOMPILING)
   set(cross_status "TRUE, for ${CMAKE_SYSTEM_NAME}, ${CMAKE_SYSTEM_PROCESSOR}")

cmake/module/FindMiniUPnPc.cmake

@@ -0,0 +1,84 @@
+# Copyright (c) 2023 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+if(NOT MSVC)
+  include(CrossPkgConfig)
+  cross_pkg_check_modules(PC_MiniUPnPc QUIET miniupnpc)
+endif()
+
+find_path(MiniUPnPc_INCLUDE_DIR
+  NAMES miniupnpc/miniupnpc.h
+  PATHS ${PC_MiniUPnPc_INCLUDE_DIRS}
+)
+
+if(MiniUPnPc_INCLUDE_DIR)
+  file(
+    STRINGS "${MiniUPnPc_INCLUDE_DIR}/miniupnpc/miniupnpc.h" version_strings
+    REGEX "^#define[\t ]+MINIUPNPC_API_VERSION[\t ]+[0-9]+"
+  )
+  string(REGEX REPLACE "^#define[\t ]+MINIUPNPC_API_VERSION[\t ]+([0-9]+)" "\\1" MiniUPnPc_API_VERSION "${version_strings}")
+
+  # The minimum supported miniUPnPc API version is set to 17. This excludes
+  # versions with known vulnerabilities.
+  if(MiniUPnPc_API_VERSION GREATER_EQUAL 17)
+    set(MiniUPnPc_API_VERSION_OK TRUE)
+  endif()
+endif()
+
+if(MSVC)
+  cmake_path(GET MiniUPnPc_INCLUDE_DIR PARENT_PATH MiniUPnPc_IMPORTED_PATH)
+  find_library(MiniUPnPc_LIBRARY_DEBUG
+    NAMES miniupnpc PATHS ${MiniUPnPc_IMPORTED_PATH}/debug/lib
+    NO_DEFAULT_PATH
+  )
+  find_library(MiniUPnPc_LIBRARY_RELEASE
+    NAMES miniupnpc PATHS ${MiniUPnPc_IMPORTED_PATH}/lib
+    NO_DEFAULT_PATH
+  )
+  set(MiniUPnPc_required MiniUPnPc_IMPORTED_PATH)
+else()
+  find_library(MiniUPnPc_LIBRARY
+    NAMES miniupnpc
+    PATHS ${PC_MiniUPnPc_LIBRARY_DIRS}
+  )
+  set(MiniUPnPc_required MiniUPnPc_LIBRARY)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(MiniUPnPc
+  REQUIRED_VARS ${MiniUPnPc_required} MiniUPnPc_INCLUDE_DIR MiniUPnPc_API_VERSION_OK
+)
+
+if(MiniUPnPc_FOUND AND NOT TARGET MiniUPnPc::MiniUPnPc)
+  add_library(MiniUPnPc::MiniUPnPc UNKNOWN IMPORTED)
+  set_target_properties(MiniUPnPc::MiniUPnPc PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${MiniUPnPc_INCLUDE_DIR}"
+  )
+  if(MSVC)
+    if(MiniUPnPc_LIBRARY_DEBUG)
+      set_property(TARGET MiniUPnPc::MiniUPnPc APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+      set_target_properties(MiniUPnPc::MiniUPnPc PROPERTIES
+        IMPORTED_LOCATION_DEBUG "${MiniUPnPc_LIBRARY_DEBUG}"
+      )
+    endif()
+    if(MiniUPnPc_LIBRARY_RELEASE)
+      set_property(TARGET MiniUPnPc::MiniUPnPc APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+      set_target_properties(MiniUPnPc::MiniUPnPc PROPERTIES
+        IMPORTED_LOCATION_RELEASE "${MiniUPnPc_LIBRARY_RELEASE}"
+      )
+    endif()
+  else()
+    set_target_properties(MiniUPnPc::MiniUPnPc PROPERTIES
+      IMPORTED_LOCATION "${MiniUPnPc_LIBRARY}"
+    )
+  endif()
+  set_property(TARGET MiniUPnPc::MiniUPnPc PROPERTY
+    INTERFACE_COMPILE_DEFINITIONS USE_UPNP=1 $<$<PLATFORM_ID:Windows>:MINIUPNP_STATICLIB>
+  )
+endif()
+
+mark_as_advanced(
+  MiniUPnPc_INCLUDE_DIR
+  MiniUPnPc_LIBRARY
+)

cmake/optional.cmake

@@ -44,3 +44,16 @@ if(WITH_NATPMP)
     message(FATAL_ERROR "libnatpmp requested, but not found.")
   endif()
 endif()
+
+if(WITH_MINIUPNPC)
+  find_package(MiniUPnPc MODULE)
+  if(MiniUPnPc_FOUND)
+    set(WITH_MINIUPNPC ON)
+  elseif(WITH_MINIUPNPC STREQUAL "AUTO")
+    message(WARNING "libminiupnpc not found, disabling.\n"
+                    "To skip libminiupnpc check, use \"-DWITH_MINIUPNPC=OFF\".\n")
+    set(WITH_MINIUPNPC OFF)
+  else()
+    message(FATAL_ERROR "libminiupnpc requested, but not found.")
+  endif()
+endif()

src/CMakeLists.txt

@@ -187,6 +187,7 @@ target_link_libraries(bitcoin_node
     libevent::libevent
     $<TARGET_NAME_IF_EXISTS:PkgConfig::libevent_pthreads>
     $<TARGET_NAME_IF_EXISTS:NATPMP::NATPMP>
+    $<TARGET_NAME_IF_EXISTS:MiniUPnPc::MiniUPnPc>
 )