diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2013-06-26 22:41:36 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2013-06-26 22:41:36 +0000 |
| commit | 87fbbcc9b363519e80a8b22fca9b4ca8909a2062 (patch) | |
| tree | e72d4ca3881558d31ac1a44db4c7607c1b98ade4 /qpid/cpp | |
| parent | de2264af286ecf624d638c4d82de1e8edda5cc8b (diff) | |
| download | qpid-python-87fbbcc9b363519e80a8b22fca9b4ca8909a2062.tar.gz | |
QPID-4955: CMake install puts config files in the wrong place
- Also removed ability to specify daemon and client config file
locations individually as that isn't straightforwardly possible
with the CMake install capability.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1497148 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/BuildInstallSettings.cmake | 3 | ||||
| -rw-r--r-- | qpid/cpp/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | qpid/cpp/etc/CMakeLists.txt | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/qpid/cpp/BuildInstallSettings.cmake b/qpid/cpp/BuildInstallSettings.cmake index b890e186b2..6b8a3afa6c 100644 --- a/qpid/cpp/BuildInstallSettings.cmake +++ b/qpid/cpp/BuildInstallSettings.cmake @@ -171,7 +171,8 @@ if (UNIX) set (QPID_INSTALL_BINDIR bin) set (QPID_INSTALL_SBINDIR sbin) set (QPID_INSTALL_TESTDIR libexec/qpid/tests) # Directory for test executables - set (QPID_INSTALL_CONFDIR ${SYSCONF_INSTALL_DIR}) + set (QPID_INSTALL_CONFDIR ${SYSCONF_INSTALL_DIR}/qpid) + set (QPID_INSTALL_INITDDIR ${SYSCONF_INSTALL_DIR}/rc.d/init.d) set (QPID_INSTALL_SASLDIR ${SYSCONF_INSTALL_DIR}/sasl2) set (QPID_INSTALL_DATADIR ${SHARE_INSTALL_DIR}/qpid) set (QPID_INSTALL_EXAMPLESDIR ${SHARE_INSTALL_DIR}/qpid/examples) diff --git a/qpid/cpp/CMakeLists.txt b/qpid/cpp/CMakeLists.txt index 9112729fc8..bffe9734f8 100644 --- a/qpid/cpp/CMakeLists.txt +++ b/qpid/cpp/CMakeLists.txt @@ -62,10 +62,6 @@ endif (WIN32) set_absolute_install_path (QPIDC_CONF_PATH ${QPID_INSTALL_CONFDIR}/qpidc.conf) set_absolute_install_path (QPIDD_CONF_PATH ${QPID_INSTALL_CONFDIR}/qpidd.conf) -set (QPIDC_CONF_FILE ${QPIDC_CONF_PATH} CACHE STRING - "Name of the Qpid client configuration file") -set (QPIDD_CONF_FILE ${QPIDD_CONF_PATH} CACHE STRING - "Name of the Qpid broker configuration file") install(FILES LICENSE NOTICE DESTINATION ${QPID_INSTALL_DOCDIR}) install(FILES include/qmf/qmfengine.i diff --git a/qpid/cpp/etc/CMakeLists.txt b/qpid/cpp/etc/CMakeLists.txt index a8aae0ee52..f867a33227 100644 --- a/qpid/cpp/etc/CMakeLists.txt +++ b/qpid/cpp/etc/CMakeLists.txt @@ -37,11 +37,11 @@ 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 - DESTINATION ${QPID_INSTALL_CONFDIR}/rc.d/init.d + DESTINATION ${QPID_INSTALL_INITDDIR} COMPONENT ${QPID_COMPONENT_BROKER}) install(FILES qpidc.conf - DESTINATION ${QPID_INSTALL_CONFDIR}/qpid + DESTINATION ${QPID_INSTALL_CONFDIR} COMPONENT ${QPID_COMPONENT_CLIENT}) install(FILES qpidd.conf |