Merge pull request #1038

43677f9 gui/libwallet_merged: libunbound is one more dependency (Ilya Kitaev)

3 files changed, 23 insertions, 9 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1ac8422a..91f0ca1fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -603,3 +603,7 @@ if(BUILD_DOCUMENTATION)
   endif()
 endif()
 
+# when ON - will install libunbound and libwallet_merged into "lib"
+option(BUILD_GUI_DEPS "Build GUI dependencies." OFF)
+
+
diff --git a/external/unbound/CMakeLists.txt b/external/unbound/CMakeLists.txt
index 0dd5d6bc4..99a44e1a6 100644
--- a/external/unbound/CMakeLists.txt
+++ b/external/unbound/CMakeLists.txt
@@ -228,3 +228,9 @@ if (MINGW)
       COPYONLY)
   endforeach ()
 endif ()
+
+
+if (BUILD_GUI_DEPS)
+    install(TARGETS unbound
+        ARCHIVE DESTINATION lib)
+endif()    
diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
index 40c5d38ae..96653556b 100644
--- a/src/wallet/CMakeLists.txt
+++ b/src/wallet/CMakeLists.txt
@@ -74,14 +74,18 @@ target_link_libraries(wallet
     ${Boost_REGEX_LIBRARY}
     ${EXTRA_LIBRARIES})
 
-set(libs_to_merge wallet cryptonote_core mnemonics common crypto ringct)
 
-foreach(lib ${libs_to_merge})
-    list(APPEND objlibs $<TARGET_OBJECTS:obj_${lib}>) # matches naming convention in src/CMakeLists.txtA
-endforeach()
-add_library(wallet_merged STATIC ${objlibs})
-install(TARGETS wallet_merged
-    ARCHIVE DESTINATION lib)
+# build and install libwallet_merged only if we building for GUI
+if (BUILD_GUI_DEPS)
+    set(libs_to_merge wallet cryptonote_core mnemonics common crypto ringct)
 
-install(FILES ${wallet_api_headers}
-    DESTINATION include/wallet)
+    foreach(lib ${libs_to_merge})
+        list(APPEND objlibs $<TARGET_OBJECTS:obj_${lib}>) # matches naming convention in src/CMakeLists.txt
+    endforeach()
+    add_library(wallet_merged STATIC ${objlibs})
+    install(TARGETS wallet_merged
+        ARCHIVE DESTINATION lib)
+
+    install(FILES ${wallet_api_headers}
+        DESTINATION include/wallet)
+endif()