diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-09-17 17:39:06 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-09-17 17:39:06 +0200 |
| commit | 77224bbf4842f3c7fb53ad7685f45cf768f5ec38 (patch) | |
| tree | 18da9d2a85b71038268b80333f3c27a116b6a3a3 /external/CMakeLists.txt | |
| parent | Merge pull request #1083 (diff) | |
| parent | remove errant target_link_libraries (diff) | |
| download | monero-77224bbf4842f3c7fb53ad7685f45cf768f5ec38.tar.xz | |
Merge pull request #1084
5850122 remove errant target_link_libraries (Riccardo Spagni)
58abc09 don't build any miniupnpc executables (Riccardo Spagni)
114e368 don't build miniupnpc test executables (Riccardo Spagni)
bb69371 updated miniupnp (Riccardo Spagni)
f62ebc5 update rapidjson (Riccardo Spagni)
Diffstat (limited to 'external/CMakeLists.txt')
| -rw-r--r-- | external/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index f0e65ac06..91611b117 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -59,15 +59,15 @@ else() add_subdirectory(miniupnpc) - set_property(TARGET upnpc-static PROPERTY FOLDER "external") + set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") if(MSVC) - set_property(TARGET upnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") + set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") elseif(NOT MSVC) - set_property(TARGET upnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") + set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") endif() set(UPNP_STATIC true PARENT_SCOPE) - set(UPNP_LIBRARIES "upnpc-static" PARENT_SCOPE) + set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) endif() find_package(Unbound) |