diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-04-11 00:26:15 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-04-11 00:26:15 +0200 |
| commit | e9ca165b1ade5add159e36840ddb7c323c724f7b (patch) | |
| tree | b20eaeac31c1e33f9a3f27798b827033a7c55596 /external | |
| parent | Merge pull request #1949 (diff) | |
| parent | IOS CMAKE build settings (diff) | |
| download | monero-e9ca165b1ade5add159e36840ddb7c323c724f7b.tar.xz | |
Merge pull request #1950
f5bd3465 IOS CMAKE build settings (Jaquee)
d8a88d05 add IOS CMAKE toolchain (Jaquee)
Diffstat (limited to 'external')
| -rw-r--r-- | external/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | external/unbound/CMakeLists.txt | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index d67a1a875..93366a4fa 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -34,11 +34,12 @@ # We always compile if we are building statically to reduce static dependency issues... # ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with # others. - -find_package(Miniupnpc QUIET) +if(NOT IOS) + find_package(Miniupnpc QUIET) +endif() # If we have the correct shared version and we're not building static, use it -if(STATIC) +if(STATIC OR IOS) set(USE_SHARED_MINIUPNPC false) elseif(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER) set(USE_SHARED_MINIUPNPC true) diff --git a/external/unbound/CMakeLists.txt b/external/unbound/CMakeLists.txt index d27997eaa..94294013f 100644 --- a/external/unbound/CMakeLists.txt +++ b/external/unbound/CMakeLists.txt @@ -215,6 +215,11 @@ endif () if (INSTALL_VENDORED_LIBUNBOUND) + if(IOS) + set(lib_folder lib-${ARCH}) + else() + set(lib_folder lib) + endif() install(TARGETS unbound - ARCHIVE DESTINATION lib) + ARCHIVE DESTINATION ${lib_folder}) endif() |