cmake [KILL 3-STATE]: Switch WITH_NATPMP to boolean w/ default OFF

CMakeLists.txt

@@ -70,7 +70,12 @@ option(REDUCE_EXPORTS "Attempt to reduce exported symbols in the resulting execu
 option(WERROR "Treat compiler warnings as errors." OFF)
 
 tristate_option(CCACHE "Use ccache for compiling." "if ccache is found." AUTO)
-tristate_option(WITH_NATPMP "Enable NAT-PMP." "if libnatpmp is found." AUTO)
+
+option(WITH_NATPMP "Enable NAT-PMP." OFF)
+if(WITH_NATPMP)
+  find_package(NATPMP MODULE REQUIRED)
+endif()
+
 tristate_option(WITH_MINIUPNPC "Enable UPnP." "if libminiupnpc is found." AUTO)
 tristate_option(WITH_ZMQ "Enable ZMQ notifications." "if libzmq is found." AUTO)
 tristate_option(WITH_USDT

cmake/optional.cmake

@@ -50,19 +50,6 @@ if(CCACHE)
   mark_as_advanced(CCACHE_COMMAND)
 endif()
 
-if(WITH_NATPMP)
-  find_package(NATPMP MODULE)
-  if(NATPMP_FOUND)
-    set(WITH_NATPMP ON)
-  elseif(WITH_NATPMP STREQUAL "AUTO")
-    message(WARNING "libnatpmp not found, disabling.\n"
-                    "To skip libnatpmp check, use \"-DWITH_NATPMP=OFF\".\n")
-    set(WITH_NATPMP OFF)
-  else()
-    message(FATAL_ERROR "libnatpmp requested, but not found.")
-  endif()
-endif()
-
 if(WITH_MINIUPNPC)
   find_package(MiniUPnPc MODULE)
   if(MiniUPnPc_FOUND)

depends/toolchain.cmake.in

@@ -142,8 +142,10 @@ if(NOT WITH_MINIUPNPC AND "@no_upnp@" STREQUAL "1")
   set(WITH_MINIUPNPC OFF CACHE STRING "Enable UPnP.")
 endif()
 
-if(NOT WITH_NATPMP AND "@no_natpmp@" STREQUAL "1")
-  set(WITH_NATPMP OFF CACHE STRING "Enable NAT-PMP.")
+if("@no_natpmp@")
+  set(WITH_NATPMP OFF CACHE BOOL "")
+else()
+  set(WITH_NATPMP ON CACHE BOOL "")
 endif()
 
 if(NOT WITH_USDT AND "@no_usdt@" STREQUAL "1")