On 04/18/2013 09:35 AM, Justin Ross wrote:
Hey, Alan. It looks like this one was garbled. Were there other
things you meant to request?
Wow, that was garbled! I think this is the only one worth considering:
commit 25eaa7e072a1f4bdfc592ac3c4ca57e265a04d40
Author: Alan Conway <[email protected]>
Commit: Alan Conway <[email protected]>
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
diff --git a/qpid/cpp/etc/CMakeLists.txt b/qpid/cpp/etc/CMakeLists.txt
index f2dbc85..a8aae0e 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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
