aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-04-11 00:26:15 +0200
committerRiccardo Spagni <ric@spagni.net>2017-04-11 00:26:15 +0200
commite9ca165b1ade5add159e36840ddb7c323c724f7b (patch)
treeb20eaeac31c1e33f9a3f27798b827033a7c55596 /src/wallet
parentMerge pull request #1949 (diff)
parentIOS CMAKE build settings (diff)
downloadmonero-e9ca165b1ade5add159e36840ddb7c323c724f7b.tar.xz
Merge pull request #1950
f5bd3465 IOS CMAKE build settings (Jaquee) d8a88d05 add IOS CMAKE toolchain (Jaquee)
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/CMakeLists.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
index aed021b9c..2e7610b64 100644
--- a/src/wallet/CMakeLists.txt
+++ b/src/wallet/CMakeLists.txt
@@ -132,8 +132,13 @@ if (BUILD_GUI_DEPS)
list(APPEND objlibs $<TARGET_OBJECTS:obj_${lib}>) # matches naming convention in src/CMakeLists.txt
endforeach()
add_library(wallet_merged STATIC ${objlibs})
+ if(IOS)
+ set(lib_folder lib-${ARCH})
+ else()
+ set(lib_folder lib)
+ endif()
install(TARGETS wallet_merged
- ARCHIVE DESTINATION lib)
+ ARCHIVE DESTINATION ${lib_folder})
install(FILES ${wallet_api_headers}
DESTINATION include/wallet)