Author: mcpierce
Date: Tue Apr 30 18:42:17 2013
New Revision: 1477766
URL: http://svn.apache.org/r1477766
Log:
QPID-4698: Fixed the install location for files under CMake.
Installs the SASL2 qpidd.conf file to /etc/qpid/sasl2/qpidd.conf
Installs qpidd-primary to /etc/rc.d/init.d/qpidd-primary
Installs the qmf-gen Python script to /usr/bin
Installs the managementgen sitepackage to where sitelibs belong
Modified:
qpid/branches/0.22/qpid/cpp/BuildInstallSettings.cmake
qpid/branches/0.22/qpid/cpp/etc/CMakeLists.txt
qpid/branches/0.22/qpid/cpp/managementgen/CMakeLists.txt
qpid/branches/0.22/qpid/cpp/src/CMakeLists.txt
Modified: qpid/branches/0.22/qpid/cpp/BuildInstallSettings.cmake
URL:
http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/cpp/BuildInstallSettings.cmake?rev=1477766&r1=1477765&r2=1477766&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/cpp/BuildInstallSettings.cmake (original)
+++ qpid/branches/0.22/qpid/cpp/BuildInstallSettings.cmake Tue Apr 30 18:42:17
2013
@@ -171,15 +171,15 @@ 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}/qpid)
- set (QPID_INSTALL_SASLDIR ${SYSCONF_INSTALL_DIR}/sasl2)
+ set (QPID_INSTALL_CONFDIR ${SYSCONF_INSTALL_DIR})
+ set (QPID_INSTALL_SASLDIR ${SYSCONF_INSTALL_DIR}/qpid/sasl2)
set (QPID_INSTALL_DATADIR ${SHARE_INSTALL_DIR}/qpid)
set (QPID_INSTALL_EXAMPLESDIR ${SHARE_INSTALL_DIR}/examples)
set (QPID_INSTALL_DOCDIR ${DOC_INSTALL_DIR}) # Directory to install
documentation
set (QPID_INSTALL_INCLUDEDIR ${INCLUDE_INSTALL_DIR})
set (QPID_INSTALL_LIBDIR ${LIB_INSTALL_DIR})
set (QPID_LOCALSTATE_DIR var) # Directory to store local state data
- set (QPID_MAN_DIR man) # Directory to install manual files
+ set (QPID_MAN_DIR share/man) # Directory to install manual files
set (QPID_INSTALL_SYSTEMDDIR usr/lib/systemd/system) # Systemd service files
set_absolute_install_path (QPIDC_MODULE_DIR
${QPID_INSTALL_LIBDIR}/qpid/client) # Directory to load client plug-in modules
from
Modified: qpid/branches/0.22/qpid/cpp/etc/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/cpp/etc/CMakeLists.txt?rev=1477766&r1=1477765&r2=1477766&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/cpp/etc/CMakeLists.txt (original)
+++ qpid/branches/0.22/qpid/cpp/etc/CMakeLists.txt Tue Apr 30 18:42:17 2013
@@ -35,13 +35,19 @@ if (UNIX)
endif (UNIX)
+set (sysconfdir ${SYSCONF_INSTALL_DIR})
+
+configure_file(qpidd-primary.in
+ ${CMAKE_CURRENT_BINARY_DIR}/qpidd-primary
+ @ONLY)
+
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 ${SYSCONF_INSTALL_DIR}/rc.d/init.d
COMPONENT ${QPID_COMPONENT_BROKER})
install(FILES qpidc.conf
- DESTINATION ${QPID_INSTALL_CONFDIR}
+ DESTINATION ${QPID_INSTALL_CONFDIR}/qpid
COMPONENT ${QPID_COMPONENT_CLIENT})
install(FILES qpidd.conf
Modified: qpid/branches/0.22/qpid/cpp/managementgen/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/cpp/managementgen/CMakeLists.txt?rev=1477766&r1=1477765&r2=1477766&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/cpp/managementgen/CMakeLists.txt (original)
+++ qpid/branches/0.22/qpid/cpp/managementgen/CMakeLists.txt Tue Apr 30
18:42:17 2013
@@ -19,8 +19,15 @@
project(qpidc-qmfgen)
cmake_minimum_required(VERSION 2.4.0 FATAL_ERROR)
-install(PROGRAMS qmf-gen DESTINATION managementgen
+find_package(PythonInterp 2.7 REQUIRED)
+
+execute_process(COMMAND ${PYTHON_EXECUTABLE}
+ -c "from distutils.sysconfig import get_python_lib; print
get_python_lib(False)"
+ OUTPUT_VARIABLE PYTHON_SITEARCH_PACKAGES
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+install(PROGRAMS qmf-gen DESTINATION ${QPID_INSTALL_BINDIR}
COMPONENT ${QPID_COMPONENT_QMF})
-install(DIRECTORY qmfgen DESTINATION managementgen
+install(DIRECTORY qmfgen DESTINATION ${PYTHON_SITEARCH_PACKAGES}/qmfgen
COMPONENT ${QPID_COMPONENT_QMF}
PATTERN ".svn" EXCLUDE PATTERN "*.pyc" EXCLUDE)
Modified: qpid/branches/0.22/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/cpp/src/CMakeLists.txt?rev=1477766&r1=1477765&r2=1477766&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/branches/0.22/qpid/cpp/src/CMakeLists.txt Tue Apr 30 18:42:17 2013
@@ -1272,8 +1272,8 @@ if (CPACK_GENERATOR STREQUAL "NSIS")
endif (CPACK_GENERATOR STREQUAL "NSIS")
if (UNIX)
- install (CODE "FILE(MAKE_DIRECTORY
\$ENV{DESTDIR}${QPID_LOCALSTATE_DIR}/lib/qpidd)")
- install (CODE "FILE(MAKE_DIRECTORY
\$ENV{DESTDIR}${QPID_LOCALSTATE_DIR}/spool/qpidd)")
+ install (CODE "FILE(MAKE_DIRECTORY
\$ENV{DESTDIR}/${QPID_LOCALSTATE_DIR}/lib/qpidd)")
+ install (CODE "FILE(MAKE_DIRECTORY
\$ENV{DESTDIR}/${QPID_LOCALSTATE_DIR}/spool/qpidd)")
endif (UNIX)
set (qmf_SOURCES
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
