diff options
| author | redfish <redfish@galactica.pw> | 2016-09-03 14:11:26 +0200 |
|---|---|---|
| committer | redfish <redfish@galactica.pw> | 2016-09-03 12:55:20 -0400 |
| commit | 77fa663e94fe9129f318dd76d53ffa627581f0fa (patch) | |
| tree | faf205f5087b852893e56762423f7c63d3eb62e9 | |
| parent | Merge pull request #1038 (diff) | |
| download | monero-77fa663e94fe9129f318dd76d53ffa627581f0fa.tar.xz | |
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.
| -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 91f0ca1fb..c9aaafedc 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() |