Fix CMake escaping.

Refs #4794
This commit is contained in:
Gerd von Egidy 2014-05-04 20:46:13 +02:00
parent 69c06115d2
commit 954ceb3c6a
2 changed files with 4 additions and 4 deletions

View File

@ -89,14 +89,14 @@ if(NOT WIN32)
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
) )
else() else()
configure_file(systemd/icinga2.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/systemd/icinga2.service) configure_file(systemd/icinga2.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/systemd/icinga2.service @ONLY)
install( install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/systemd/icinga2.service FILES ${CMAKE_CURRENT_BINARY_DIR}/systemd/icinga2.service
DESTINATION ${DESTDIR}/usr/lib/systemd/system DESTINATION ${DESTDIR}/usr/lib/systemd/system
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_EXECUTE WORLD_READ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_EXECUTE WORLD_READ
) )
configure_file(systemd/icinga2.sysconfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/systemd/icinga2) configure_file(systemd/icinga2.sysconfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/systemd/icinga2 @ONLY)
install( install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/systemd/icinga2 FILES ${CMAKE_CURRENT_BINARY_DIR}/systemd/icinga2
DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/sysconfig DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/sysconfig

View File

@ -1,7 +1,7 @@
ICINGA2_CONFIG_FILE=@CMAKE_INSTALL_FULL_SYSCONFDIR@/icinga2/icinga2.conf ICINGA2_CONFIG_FILE=@CMAKE_INSTALL_FULL_SYSCONFDIR@/icinga2/icinga2.conf
ICINGA2_STATE_DIR=@CMAKE_INSTALL_FULL_LOCALSTATEDIR@ ICINGA2_STATE_DIR=@CMAKE_INSTALL_FULL_LOCALSTATEDIR@
ICINGA2_ERROR_LOG=$ICINGA2_STATE_DIR/log/icinga2/error.log ICINGA2_ERROR_LOG=${ICINGA2_STATE_DIR}/log/icinga2/error.log
ICINGA2_LOG=$ICINGA2_STATE_DIR/log/icinga2/icinga2.log ICINGA2_LOG=${ICINGA2_STATE_DIR}/log/icinga2/icinga2.log
ICINGA2_USER=@ICINGA2_USER@ ICINGA2_USER=@ICINGA2_USER@
ICINGA2_GROUP=@ICINGA2_GROUP@ ICINGA2_GROUP=@ICINGA2_GROUP@
ICINGA2_COMMAND_USER=@ICINGA2_COMMAND_USER@ ICINGA2_COMMAND_USER=@ICINGA2_COMMAND_USER@