Merge pull request #6112

7c1d31b0 build: fix IOS, build blockchain_db and rpc, skip wallet_rpc_server (xiphon)

src/CMakeLists.txt

@@ -113,12 +113,10 @@ add_subdirectory(lmdb)
 add_subdirectory(multisig)
 add_subdirectory(net)
 add_subdirectory(hardforks)
-if(NOT IOS)
-  add_subdirectory(blockchain_db)
-endif()
+add_subdirectory(blockchain_db)
 add_subdirectory(mnemonics)
+add_subdirectory(rpc)
 if(NOT IOS)
-  add_subdirectory(rpc)
   add_subdirectory(serialization)
 endif()
 add_subdirectory(wallet)

src/wallet/CMakeLists.txt

@@ -77,42 +77,43 @@ target_link_libraries(wallet
   PRIVATE
     ${EXTRA_LIBRARIES})
 
-set(wallet_rpc_sources
-  wallet_rpc_server.cpp)
+if(NOT IOS)
+  set(wallet_rpc_sources
+    wallet_rpc_server.cpp)
 
-set(wallet_rpc_headers)
+  set(wallet_rpc_headers)
 
-set(wallet_rpc_private_headers
-  wallet_rpc_server.h)
+  set(wallet_rpc_private_headers
+    wallet_rpc_server.h)
 
-monero_private_headers(wallet_rpc_server
-  ${wallet_rpc_private_headers})
-monero_add_executable(wallet_rpc_server
-  ${wallet_rpc_sources}
-  ${wallet_rpc_headers}
-  ${wallet_rpc_private_headers})
-
-target_link_libraries(wallet_rpc_server
-  PRIVATE
-    wallet
-    rpc_base
-    cryptonote_core
-    cncrypto
-    common
-    version
-    daemonizer
-    ${EPEE_READLINE}
-    ${Boost_CHRONO_LIBRARY}
-    ${Boost_PROGRAM_OPTIONS_LIBRARY}
-    ${Boost_FILESYSTEM_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-    ${EXTRA_LIBRARIES})
-set_property(TARGET wallet_rpc_server
-  PROPERTY
-    OUTPUT_NAME "monero-wallet-rpc")
-install(TARGETS wallet_rpc_server DESTINATION bin)
+  monero_private_headers(wallet_rpc_server
+    ${wallet_rpc_private_headers})
+  monero_add_executable(wallet_rpc_server
+    ${wallet_rpc_sources}
+    ${wallet_rpc_headers}
+    ${wallet_rpc_private_headers})
 
+  target_link_libraries(wallet_rpc_server
+    PRIVATE
+      wallet
+      rpc_base
+      cryptonote_core
+      cncrypto
+      common
+      version
+      daemonizer
+      ${EPEE_READLINE}
+      ${Boost_CHRONO_LIBRARY}
+      ${Boost_PROGRAM_OPTIONS_LIBRARY}
+      ${Boost_FILESYSTEM_LIBRARY}
+      ${Boost_THREAD_LIBRARY}
+      ${CMAKE_THREAD_LIBS_INIT}
+      ${EXTRA_LIBRARIES})
+  set_property(TARGET wallet_rpc_server
+    PROPERTY
+      OUTPUT_NAME "monero-wallet-rpc")
+  install(TARGETS wallet_rpc_server DESTINATION bin)
+endif()
 
 # build and install libwallet_merged only if we building for GUI
 if (BUILD_GUI_DEPS)