From 87f400853d600d595c3686732d2f1b6278c8d8a8 Mon Sep 17 00:00:00 2001 From: EDDragonWolf Date: Tue, 20 Mar 2018 03:09:41 -0700 Subject: [PATCH] Disabled some modules --- CMakeLists.txt | 2 +- src/supernode/CMakeLists.txt | 39 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f99fb923..b4583c750 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -734,7 +734,7 @@ if(BUILD_DOCUMENTATION) endif() # when ON - will install libwallet_merged into "lib" -option(BUILD_GUI_DEPS "Build GUI dependencies." OFF) +option(BUILD_GUI_DEPS "Build GUI dependencies." ON) # This is not nice, distribution packagers should not enable this, but depend # on libunbound shipped with their distribution instead diff --git a/src/supernode/CMakeLists.txt b/src/supernode/CMakeLists.txt index 25214fd3e..c8b446694 100644 --- a/src/supernode/CMakeLists.txt +++ b/src/supernode/CMakeLists.txt @@ -159,23 +159,22 @@ add_dependencies(supernode version) # install(TARGETS supernode_rpc_server DESTINATION bin) #endif() - -## build and install libsupernode_merged only if we building for GUI -#if (BUILD_GUI_DEPS) -# set(libs_to_merge supernode cryptonote_core cryptonote_basic mnemonics common cncrypto ringct) - -# foreach(lib ${libs_to_merge}) -# list(APPEND objlibs $) # matches naming convention in src/CMakeLists.txt -# endforeach() -# add_library(supernode_merged STATIC ${objlibs}) -# if(IOS) -# set(lib_folder lib-${ARCH}) -# else() -# set(lib_folder lib) -# endif() -# install(TARGETS supernode_merged -# ARCHIVE DESTINATION ${lib_folder}) - -# install(FILES ${supernode_api_headers} -# DESTINATION include/supernode) -#endif() +# build and install libsupernode_merged only if we building for GUI +if (BUILD_GUI_DEPS) + set(libs_to_merge supernode cryptonote_core cryptonote_basic mnemonics common cncrypto ringct) + + foreach(lib ${libs_to_merge}) + list(APPEND objlibs $) # matches naming convention in src/CMakeLists.txt + endforeach() + add_library(supernode_merged STATIC ${objlibs}) + if(IOS) + set(lib_folder lib-${ARCH}) + else() + set(lib_folder lib) + endif() + install(TARGETS supernode_merged + ARCHIVE DESTINATION ${lib_folder}) + + install(FILES ${supernode_api_headers} + DESTINATION include/supernode) +endif()