diff options
| author | Alan Conway <aconway@apache.org> | 2013-04-11 19:03:20 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2013-04-11 19:03:20 +0000 |
| commit | 25eaa7e072a1f4bdfc592ac3c4ca57e265a04d40 (patch) | |
| tree | c5ed75780feb61ca72d9bd2ea08f92d7c49a121e /qpid/cpp/etc | |
| parent | a06ad46954898855b5b4f1914a46dc81de59d54e (diff) | |
| download | qpid-python-25eaa7e072a1f4bdfc592ac3c4ca57e265a04d40.tar.gz | |
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
Diffstat (limited to 'qpid/cpp/etc')
| -rw-r--r-- | qpid/cpp/etc/CMakeLists.txt | 29 |
1 files changed, 17 insertions, 12 deletions
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 |