svn commit: r1497148 - in /qpid/trunk/qpid/cpp: BuildInstallSettings.cmake CMakeLists.txt etc/CMakeLists.txt

[as...@apache.org]

Author: astitcher
Date: Wed Jun 26 22:41:36 2013
New Revision: 1497148

URL: http://svn.apache.org/r1497148
Log:
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.

Modified:
    qpid/trunk/qpid/cpp/BuildInstallSettings.cmake
    qpid/trunk/qpid/cpp/CMakeLists.txt
    qpid/trunk/qpid/cpp/etc/CMakeLists.txt

Modified: qpid/trunk/qpid/cpp/BuildInstallSettings.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/BuildInstallSettings.cmake?rev=1497148&r1=1497147&r2=1497148&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/BuildInstallSettings.cmake (original)
+++ qpid/trunk/qpid/cpp/BuildInstallSettings.cmake Wed Jun 26 22:41:36 2013
@@ -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)

Modified: qpid/trunk/qpid/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeLists.txt?rev=1497148&r1=1497147&r2=1497148&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/CMakeLists.txt Wed Jun 26 22:41:36 2013
@@ -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

Modified: qpid/trunk/qpid/cpp/etc/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/CMakeLists.txt?rev=1497148&r1=1497147&r2=1497148&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/etc/CMakeLists.txt Wed Jun 26 22:41:36 2013
@@ -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



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org