Merge pull request #1038
43677f9
gui/libwallet_merged: libunbound is one more dependency (Ilya Kitaev)
This commit is contained in:
commit
aa996e3a60
|
@ -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)
|
||||
|
||||
|
||||
|
|
|
@ -228,3 +228,9 @@ if (MINGW)
|
|||
COPYONLY)
|
||||
endforeach ()
|
||||
endif ()
|
||||
|
||||
|
||||
if (BUILD_GUI_DEPS)
|
||||
install(TARGETS unbound
|
||||
ARCHIVE DESTINATION lib)
|
||||
endif()
|
||||
|
|
|
@ -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()
|
||||
|
|
Loading…
Reference in New Issue