Mercurial > irccd
changeset 827:2ecff01d4277
cmake: start moving options from IrccdOptions.cmake
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Tue, 15 Jan 2019 20:13:44 +0100 |
| parents | f85faf0f5d70 |
| children | 6cc8f27447ee |
| files | CMakeLists.txt cmake/IrccdOptions.cmake systemd/CMakeLists.txt |
| diffstat | 3 files changed, 15 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Tue Jan 08 21:47:59 2019 +0100 +++ b/CMakeLists.txt Tue Jan 15 20:13:44 2019 +0100 @@ -128,6 +128,7 @@ message(" User docs: ${IRCCD_WITH_HTML_MSG}") message(" Doxygen: ${IRCCD_WITH_DOXYGEN_MSG}") message(" Package: ${IRCCD_PACKAGE_MSG}") +message(" Systemd: ${IRCCD_WITH_SYSTEMD_MSG}") message("") message("Installing plugins:")
--- a/cmake/IrccdOptions.cmake Tue Jan 08 21:47:59 2019 +0100 +++ b/cmake/IrccdOptions.cmake Tue Jan 15 20:13:44 2019 +0100 @@ -1,5 +1,5 @@ # -# Options.cmake -- CMake build system for irccd +# IrccdOptions.cmake -- CMake build system for irccd # # Copyright (c) 2013-2019 David Demelier <markand@malikania.fr> # @@ -28,7 +28,6 @@ # IRCCD_WITH_PKGCONFIG Install pkg-config files (default: on, off for Windows (except MinGW)) # IRCCD_WITH_PLUGIN_<NAME> Enable or disable the specified plugin (default: on) # IRCCD_WITH_SSL Enable OpenSSL (default: on) -# IRCCD_WITH_SYSTEMD Install systemd service (default: on for Linux) # IRCCD_WITH_TESTS Enable unit testing (default: off) # # Note: the option() commands for IRCCD_WITH_PLUGIN_<name> variables are @@ -42,13 +41,6 @@ set(DEFAULT_MAN "Yes") endif () -# Systemd unit file -if (CMAKE_SYSTEM_NAME MATCHES "Linux") - set(DEFAULT_SYSTEMD "Yes") -else () - set(DEFAULT_SYSTEMD "No") -endif () - # pkg-config is only relevant on UNIX or MinGW if (MINGW OR UNIX) set(DEFAULT_PKGCONFIG "Yes") @@ -64,7 +56,6 @@ option(IRCCD_WITH_MAN "Install man pages" ${DEFAULT_MAN}) option(IRCCD_WITH_PKGCONFIG "Enable pkg-config file" ${DEFAULT_PKGCONFIG}) option(IRCCD_WITH_SSL "Enable SSL" On) -option(IRCCD_WITH_SYSTEMD "Install systemd service" ${DEFAULT_SYSTEMD}) option(IRCCD_WITH_TESTS "Enable unit testing" Off) #
--- a/systemd/CMakeLists.txt Tue Jan 08 21:47:59 2019 +0100 +++ b/systemd/CMakeLists.txt Tue Jan 15 20:13:44 2019 +0100 @@ -16,9 +16,19 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # -project(contrib) +project(systemd) + +if (CMAKE_SYSTEM_NAME MATCHES "Linux") + set(DEFAULT_SYSTEMD "Yes") +else () + set(DEFAULT_SYSTEMD "No") +endif () + +option(IRCCD_WITH_SYSTEMD "Install systemd service" ${DEFAULT_SYSTEMD}) if (IRCCD_WITH_SYSTEMD) + setg(IRCCD_WITH_SYSTEMD_MSG "Yes") + set(PATH "${CMAKE_INSTALL_FULL_BINDIR}/irccd") configure_file( @@ -30,4 +40,6 @@ FILES ${CMAKE_CURRENT_BINARY_DIR}/irccd.service DESTINATION "/usr/lib/systemd/system" ) +else () + setg(IRCCD_WITH_SYSTEMD_MSG "No (disabled by user)") endif()