From 25eaa7e072a1f4bdfc592ac3c4ca57e265a04d40 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 11 Apr 2013 19:03:20 +0000 Subject: QPID-4733: Fix windows problem introduced by installation of init scripts Do init script installation conditional on UNIX only. SYSCONF_INSTALL_DIR is not set on windows. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467054 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/CMakeLists.txt | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'qpid/cpp/etc') diff --git a/qpid/cpp/etc/CMakeLists.txt b/qpid/cpp/etc/CMakeLists.txt index f2dbc85386..a8aae0ee52 100644 --- a/qpid/cpp/etc/CMakeLists.txt +++ b/qpid/cpp/etc/CMakeLists.txt @@ -17,18 +17,23 @@ # under the License. # -# Use automake variable names as these files are also configured by automake. -set_absolute_install_path (bindir ${QPID_INSTALL_BINDIR}) -set_absolute_install_path (sysconfdir ${SYSCONF_INSTALL_DIR}) -set_absolute_install_path (sbindir ${QPID_INSTALL_SBINDIR}) - -configure_file(qpidd.in - ${CMAKE_CURRENT_BINARY_DIR}/qpidd - @ONLY) - -configure_file(qpidd-primary.in - ${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary - @ONLY) +if (UNIX) + + # Use automake variable names as these files are also configured by automake. + # Use absolute paths as these are substituted into init scripts. + set_absolute_install_path (bindir ${QPID_INSTALL_BINDIR}) + set_absolute_install_path (sysconfdir ${SYSCONF_INSTALL_DIR}) + set_absolute_install_path (sbindir ${QPID_INSTALL_SBINDIR}) + + configure_file(qpidd.in + ${CMAKE_CURRENT_BINARY_DIR}/qpidd + @ONLY) + + configure_file(qpidd-primary.in + ${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary + @ONLY) + +endif (UNIX) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qpidd ${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -- cgit v1.2.1