nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake: split BUILD_GUI_DEPS option into two

Browse Source 
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.
This commit is contained in:
redfish 2016-09-03 14:11:26 +02:00
parent aa996e3a60
commit 77fa663e94
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -603,7 +603,11 @@ if(BUILD_DOCUMENTATION)
endif() endif()
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) 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)

2
external/unbound/CMakeLists.txt vendored
View File

@ -230,7 +230,7 @@ if (MINGW)
endif () endif ()
if (BUILD_GUI_DEPS) if (INSTALL_VENDORED_LIBUNBOUND)
install(TARGETS unbound install(TARGETS unbound
ARCHIVE DESTINATION lib) ARCHIVE DESTINATION lib)
endif() endif()