diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-09-18 16:33:18 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-09-18 16:33:21 +0200 |
| commit | 9c40bc62fceecd51f3aba84f2559d4abc4ce80d2 (patch) | |
| tree | aa3076d775ebdb2278be488636fd2852dd6e3fe7 /external | |
| parent | Merge pull request #4381 (diff) | |
| parent | Fixup 32bit arm build (diff) | |
| download | monero-9c40bc62fceecd51f3aba84f2559d4abc4ce80d2.tar.xz | |
Merge pull request #3430
42397359 Fixup 32bit arm build (TheCharlatan)
a06d2581 Fix Windows build (TheCharlatan)
ecaf5b3f Add libsodium to the packages, the arm build was complaining about it. (TheCharlatan)
cbbf4d24 Adapt translations to upstream changes (TheCharlatan)
db571546 Updated pcsc url (TheCharlatan)
f0ba19fd Add lrelease to the depends (TheCharlatan)
cfb30462 Add Miniupnp submodule (TheCharlatan)
5f7da005 Unbound is now a submodule. Adapt depends for this. (TheCharlatan)
d6b9bdd3 Update readmes to reflect the usage of depends (TheCharlatan)
56b6e41e Add support for apple and arm building (TheCharlatan)
29311fd1 Disable stack unwinding for mingw32 depends build. (TheCharlatan)
8db3d573 Modify depends for monero's dependencies (TheCharlatan)
0806a23a Initial depends addition (TheCharlatan)
Diffstat (limited to 'external')
| -rw-r--r-- | external/CMakeLists.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 358d47a4f..7553f87ea 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -38,9 +38,7 @@ find_package(Miniupnpc REQUIRED) message(STATUS "Using in-tree miniupnpc") - add_subdirectory(miniupnp/miniupnpc) - set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") if(MSVC) set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") |