aboutsummaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorJaquee <jaquee.monero@gmail.com>2017-04-02 12:19:25 +0200
committerJaquee <jaquee.monero@gmail.com>2017-04-03 18:38:50 +0200
commitf5bd346573aacba601c948038e39aed24c8c069e (patch)
tree7cc11ce2bb2195ef4d11c54b34f20918e3fdb455 /external
parentadd IOS CMAKE toolchain (diff)
downloadmonero-f5bd346573aacba601c948038e39aed24c8c069e.tar.xz
IOS CMAKE build settings
Diffstat (limited to 'external')
-rw-r--r--external/CMakeLists.txt7
-rw-r--r--external/unbound/CMakeLists.txt7
2 files changed, 10 insertions, 4 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 3c0c0d68e..7dbb55479 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()