From e6919050d3cd6fdb2e2af49f2a3e5ed092a674e2 Mon Sep 17 00:00:00 2001 From: Logan oos Even <46396513+Logan007@users.noreply.github.com> Date: Sat, 25 Dec 2021 14:09:21 +0100 Subject: [PATCH] conditionally disabled libnatpmp support with CMake on Windows (#914) --- CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 022ed8b..277ea34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,10 +80,12 @@ endif(N2N_OPTION_USE_ZSTD) if(N2N_OPTION_USE_PORTMAPPING) ADD_DEFINITIONS("-DHAVE_MINIUPNP") - ADD_DEFINITIONS("-DHAVE_NATPMP") include_directories(${THIRD_PARTY_DIR}/miniupnp/miniupnpc/include) include_directories(${PROJECT_BINARY_DIR}/lib_miniupnpc) +if(NOT DEFINED WIN32) + ADD_DEFINITIONS("-DHAVE_NATPMP") include_directories(${THIRD_PARTY_DIR}/libnatpmp) +endif(NOT DEFINED WIN32) endif(N2N_OPTION_USE_PORTMAPPING) if(NOT DEFINED CMAKE_BUILD_TYPE) @@ -170,9 +172,12 @@ endif(N2N_OPTION_USE_ZSTD) if(N2N_OPTION_USE_PORTMAPPING) add_subdirectory(${THIRD_PARTY_DIR}/miniupnp/miniupnpc lib_miniupnpc) link_directories(${PROJECT_BINARY_DIR}/lib_miniupnpc) + target_link_libraries(n2n libminiupnpc-static) +if(NOT DEFINED WIN32) add_subdirectory(${THIRD_PARTY_DIR}/libnatpmp libnatpmp) link_directories(${PROJECT_BINARY_DIR}/libnatpmp) - target_link_libraries(n2n libminiupnpc-static natpmp) + target_link_libraries(n2n natpmp) +endif(NOT DEFINED WIN32) endif(N2N_OPTION_USE_PORTMAPPING) if(DEFINED WIN32)