Merge pull request #3038

eb39a3d7 wallet_api: make this optional but not built by default (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-01-25 16:44:23 -08:00
commit 153e319cd4
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 4 additions and 2 deletions

View file

@ -126,6 +126,6 @@ if (BUILD_GUI_DEPS)
endif() endif()
install(TARGETS wallet_merged install(TARGETS wallet_merged
ARCHIVE DESTINATION ${lib_folder}) ARCHIVE DESTINATION ${lib_folder})
add_subdirectory(api)
endif() endif()
add_subdirectory(api)

View file

@ -78,6 +78,8 @@ target_link_libraries(wallet_api
PRIVATE PRIVATE
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
set_property(TARGET wallet_api PROPERTY EXCLUDE_FROM_ALL TRUE)
set_property(TARGET obj_wallet_api PROPERTY EXCLUDE_FROM_ALL TRUE)
if(IOS) if(IOS)
set(lib_folder lib-${ARCH}) set(lib_folder lib-${ARCH})