Mercurial > irccd
changeset 112:a45a0f817a7b
CMake: move contrib options into IrccdOptions.cmake, #481
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Wed, 27 Apr 2016 21:52:00 +0200 |
| parents | 1ed760f6e0c6 |
| children | 6a99814c2317 |
| files | cmake/IrccdOptions.cmake contrib/CMakeLists.txt |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/cmake/IrccdOptions.cmake Wed Apr 27 21:37:09 2016 +0200 +++ b/cmake/IrccdOptions.cmake Wed Apr 27 21:52:00 2016 +0200 @@ -22,7 +22,7 @@ # WITH_SSL Enable OpenSSL (default: on) # WITH_JS Enable JavaScript (default: on) # WITH_TESTS Enable unit testing (default: off) -# WITH_SYSTEMD Install systemd service (default: off) +# WITH_SYSTEMD Install systemd service (default: on for Linux) # WITH_DOCS Enable building of all documentation (default: on) # WITH_DOXYGEN Enable internal irccd documentation (default: on) # WITH_HTML Enable HTML documentation @@ -44,6 +44,7 @@ # WITH_CONFDIR Path where to search configuration files # WITH_CACHEDIR Path where to store temporary files # WITH_PKGCONFIGDIR Path where to install pkg-config files +# WITH_SYSTEMDDIR Path where to install systemd unit file # # @@ -108,6 +109,7 @@ set(WITH_CONFDIR "etc" CACHE STRING "Configuration directory") set(WITH_CMAKEDIR "lib/cmake" CACHE STRING "Directory for CMake modules") set(WITH_PKGCONFIGDIR "lib/pkgconfig" CACHE STRING "Directory for pkg-config file") +set(WITH_SYSTEMDDIR "/usr/lib/systemd/system" CACHE STRING "Absolute path where to install systemd files") # # On Windows, we install the applcation like C:/Program Files/irccd so do not append irccd to the
--- a/contrib/CMakeLists.txt Wed Apr 27 21:37:09 2016 +0200 +++ b/contrib/CMakeLists.txt Wed Apr 27 21:52:00 2016 +0200 @@ -19,8 +19,6 @@ project(contrib) if (WITH_SYSTEMD) - # Directory for systemd - set(WITH_SYSTEMDDIR "/usr/lib/systemd/system" CACHE STRING "Absolute path where to install systemd files") set(PATH "${CMAKE_INSTALL_PREFIX}/${WITH_BINDIR}/irccd") configure_file(