kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1038

Browse source 
43677f9 gui/libwallet_merged: libunbound is one more dependency (Ilya Kitaev)
This commit is contained in:
Riccardo Spagni 2016-09-03 14:11:26 +02:00
commit aa996e3a60
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -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)

6
external/unbound/CMakeLists.txt vendored
View file

@ -228,3 +228,9 @@ if (MINGW)
COPYONLY)
endforeach ()
endif ()
if (BUILD_GUI_DEPS)
install(TARGETS unbound
ARCHIVE DESTINATION lib)
endif()

18
src/wallet/CMakeLists.txt
View file

@ -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
# 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)
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}
install(FILES ${wallet_api_headers}
DESTINATION include/wallet)
endif()