github/n2n
4
0
Fork 0
mirror of https://github.com/ntop/n2n.git synced 2024-04-21 16:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

re-enabled libnatpmp with CMake on Windows (#918)

Browse Source
This commit is contained in:
Logan oos Even
2021-12-30 09:49:39 +01:00
committed by GitHub
parent dcfa27e9e2
commit bca9968c91
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+5 -9
View File
@@ -82,10 +82,8 @@ if(N2N_OPTION_USE_PORTMAPPING)
ADD_DEFINITIONS("-DHAVE_MINIUPNP")
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)
ADD_DEFINITIONS("-DHAVE_NATPMP")
include_directories(${THIRD_PARTY_DIR}/libnatpmp)
endif(N2N_OPTION_USE_PORTMAPPING)
if(NOT DEFINED CMAKE_BUILD_TYPE)
@@ -173,11 +171,9 @@ 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 natpmp)
endif(NOT DEFINED WIN32)
add_subdirectory(${THIRD_PARTY_DIR}/libnatpmp libnatpmp)
link_directories(${PROJECT_BINARY_DIR}/libnatpmp)
target_link_libraries(n2n natpmp)
endif(N2N_OPTION_USE_PORTMAPPING)
if(DEFINED WIN32)
thirdparty/libnatpmp
Vendored
+1 -1
Submodule thirdparty/libnatpmp updated: 4536032ae3...4b8b4470d7
thirdparty/miniupnp
Vendored
+1 -1
Submodule thirdparty/miniupnp updated: 77876aea5f...78823d762e