Merge pull request #1709

b2ac939e Fix GUI building after libcryptonote_core was split (#1626) (iDunk5400)
This commit is contained in:
Riccardo Spagni 2017-02-12 23:24:19 +02:00
commit 47687399fb
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -126,7 +126,7 @@ endif()
# build and install libwallet_merged only if we building for GUI # build and install libwallet_merged only if we building for GUI
if (BUILD_GUI_DEPS) if (BUILD_GUI_DEPS)
set(libs_to_merge wallet cryptonote_core mnemonics common crypto ringct) set(libs_to_merge wallet cryptonote_core cryptonote_basic mnemonics common crypto ringct)
foreach(lib ${libs_to_merge}) foreach(lib ${libs_to_merge})
list(APPEND objlibs $<TARGET_OBJECTS:obj_${lib}>) # matches naming convention in src/CMakeLists.txt list(APPEND objlibs $<TARGET_OBJECTS:obj_${lib}>) # matches naming convention in src/CMakeLists.txt