From 77fa663e94fe9129f318dd76d53ffa627581f0fa Mon Sep 17 00:00:00 2001 From: redfish Date: Sat, 3 Sep 2016 14:11:26 +0200 Subject: [PATCH] cmake: split BUILD_GUI_DEPS option into two The split is to make this software more packageable. 'make install' is used by the package building scripts, and should not be installing vendored dependencies onto the system. --- CMakeLists.txt | 6 +++++- external/unbound/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 91f0ca1f..c9aaafed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -603,7 +603,11 @@ if(BUILD_DOCUMENTATION) endif() endif() -# when ON - will install libunbound and libwallet_merged into "lib" +# when ON - will install libwallet_merged into "lib" option(BUILD_GUI_DEPS "Build GUI dependencies." OFF) +# This is not nice, distribution packagers should not enable this, but depend +# on libunbound shipped with their distribution instead +option(INSTALL_VENDORED_LIBUNBOUND "Install libunbound binary built from source vendored with this repo." OFF) + diff --git a/external/unbound/CMakeLists.txt b/external/unbound/CMakeLists.txt index 99a44e1a..4b82fab8 100644 --- a/external/unbound/CMakeLists.txt +++ b/external/unbound/CMakeLists.txt @@ -230,7 +230,7 @@ if (MINGW) endif () -if (BUILD_GUI_DEPS) +if (INSTALL_VENDORED_LIBUNBOUND) install(TARGETS unbound ARCHIVE DESTINATION lib) endif()