diff options
author | Jaquee <jaquee.monero@gmail.com> | 2017-04-02 12:19:25 +0200 |
---|---|---|
committer | Jaquee <jaquee.monero@gmail.com> | 2017-04-03 18:38:50 +0200 |
commit | f5bd346573aacba601c948038e39aed24c8c069e (patch) | |
tree | 7cc11ce2bb2195ef4d11c54b34f20918e3fdb455 /src | |
parent | add IOS CMAKE toolchain (diff) | |
download | monero-f5bd346573aacba601c948038e39aed24c8c069e.tar.xz |
IOS CMAKE build settings
Diffstat (limited to '')
-rw-r--r-- | src/CMakeLists.txt | 24 | ||||
-rw-r--r-- | src/crypto/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/wallet/CMakeLists.txt | 7 |
3 files changed, 22 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7cf03db71..d83242a3c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -101,18 +101,24 @@ add_subdirectory(crypto) add_subdirectory(ringct) add_subdirectory(cryptonote_basic) add_subdirectory(cryptonote_core) -add_subdirectory(blockchain_db) +if(NOT IOS) + add_subdirectory(blockchain_db) +endif() add_subdirectory(mnemonics) -add_subdirectory(rpc) +if(NOT IOS) + add_subdirectory(rpc) +endif() add_subdirectory(wallet) -add_subdirectory(p2p) +if(NOT IOS) + add_subdirectory(p2p) +endif() add_subdirectory(cryptonote_protocol) - -add_subdirectory(simplewallet) -add_subdirectory(daemonizer) -add_subdirectory(daemon) - -add_subdirectory(blockchain_utilities) +if(NOT IOS) + add_subdirectory(simplewallet) + add_subdirectory(daemonizer) + add_subdirectory(daemon) + add_subdirectory(blockchain_utilities) +endif() if(PER_BLOCK_CHECKPOINT) add_subdirectory(blocks) diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt index c047b0042..277ee64c2 100644 --- a/src/crypto/CMakeLists.txt +++ b/src/crypto/CMakeLists.txt @@ -93,7 +93,7 @@ endif() # Because of the way Qt works on android with JNI, the code does not live in the main android thread # So this code runs with a 1 MB default stack size. # This will force the use of the heap for the allocation of the scratchpad -if (ANDROID) +if (ANDROID OR IOS) if( BUILD_GUI_DEPS ) add_definitions(-DFORCE_USE_HEAP=1) endif() 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) |