Skip to content
This repository has been archived by the owner on Sep 16, 2022. It is now read-only.

Fixes #7

Open
wants to merge 3 commits into
base: monero
Choose a base branch
from
Open

Fixes #7

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db0e094
miniupnpc: add BUILD_INTERFACE generator expression to static target
anonimal Sep 25, 2019
8397314
miniupnpc: fix wrong target when building shared lib
anonimal Oct 18, 2019
5bdb473
miniupnpc: add BUILD_INTERFACE generator expression to shared target
anonimal Oct 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions miniupnpc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ if (MSVC)
endif()

configure_file (${CMAKE_CURRENT_SOURCE_DIR}/miniupnpcstrings.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/miniupnpcstrings.h)
target_include_directories(miniupnpc-private INTERFACE ${CMAKE_CURRENT_BINARY_DIR})
target_include_directories(miniupnpc-private INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")

set (MINIUPNPC_SOURCES
igd_desc_parse.c
Expand Down Expand Up @@ -125,7 +125,7 @@ if (UPNPC_BUILD_STATIC)
add_library (libminiupnpc-static STATIC ${MINIUPNPC_SOURCES})
set_target_properties (libminiupnpc-static PROPERTIES OUTPUT_NAME "miniupnpc")
target_link_libraries (libminiupnpc-static PRIVATE miniupnpc-private)
target_include_directories(libminiupnpc-static INTERFACE ../${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(libminiupnpc-static INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
target_compile_definitions(libminiupnpc-static PUBLIC MINIUPNP_STATICLIB)

install (TARGETS libminiupnpc-static
Expand All @@ -148,7 +148,7 @@ if (UPNPC_BUILD_SHARED)
target_link_libraries (libminiupnpc-shared PRIVATE miniupnpc-private)
target_compile_definitions(libminiupnpc-shared PRIVATE MINIUPNP_EXPORTS)

target_include_directories(libminiupnpc-static INTERFACE ../${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(libminiupnpc-shared INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
if (WIN32)
target_link_libraries(libminiupnpc-shared INTERFACE ws2_32 iphlpapi)
endif()
Expand Down