aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-01-25 16:44:23 -0800
committerRiccardo Spagni <ric@spagni.net>2018-01-25 16:44:23 -0800
commit153e319cd453443ec2f63c2bc9733473e5662d58 (patch)
treee6114222133ec8d53185c8cf31e79ec683aacd9c
parentMerge pull request #3036 (diff)
parentwallet_api: make this optional but not built by default (diff)
downloadmonero-153e319cd453443ec2f63c2bc9733473e5662d58.tar.xz
Merge pull request #3038
eb39a3d7 wallet_api: make this optional but not built by default (moneromooo-monero)
-rw-r--r--src/wallet/CMakeLists.txt4
-rw-r--r--src/wallet/api/CMakeLists.txt2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
index 2d664ba15..abecabbc3 100644
--- a/src/wallet/CMakeLists.txt
+++ b/src/wallet/CMakeLists.txt
@@ -126,6 +126,6 @@ if (BUILD_GUI_DEPS)
endif()
install(TARGETS wallet_merged
ARCHIVE DESTINATION ${lib_folder})
-
- add_subdirectory(api)
endif()
+
+add_subdirectory(api)
diff --git a/src/wallet/api/CMakeLists.txt b/src/wallet/api/CMakeLists.txt
index 26127b75c..60d6970bd 100644
--- a/src/wallet/api/CMakeLists.txt
+++ b/src/wallet/api/CMakeLists.txt
@@ -78,6 +78,8 @@ target_link_libraries(wallet_api
PRIVATE
${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)
set(lib_folder lib-${ARCH})