diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-09-10 15:10:08 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-09-10 15:10:08 +0200 |
| commit | 7bebbbe5fe7da49a142c89e3fa61413bfb2a8654 (patch) | |
| tree | cdf172ff0de82dd43779b93787093592cc8a0432 | |
| parent | Merge pull request #1041 (diff) | |
| parent | cmake: split BUILD_GUI_DEPS option into two (diff) | |
| download | monero-7bebbbe5fe7da49a142c89e3fa61413bfb2a8654.tar.xz | |
Merge pull request #1040
77fa663 cmake: split BUILD_GUI_DEPS option into two (redfish)
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | external/unbound/CMakeLists.txt | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 98ac1b600..519ce635d 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 99a44e1a6..4b82fab82 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() |