diff options
| author | Darryl L. Pierce <mcpierce@apache.org> | 2013-02-18 21:08:41 +0000 |
|---|---|---|
| committer | Darryl L. Pierce <mcpierce@apache.org> | 2013-02-18 21:08:41 +0000 |
| commit | 135cf5d93b7052bdf7c02dc61d4c590c6fba06fa (patch) | |
| tree | 1d990e4b8b6900af022a774b688a7dcaa396c3fb /cpp | |
| parent | 9c541ffa148dc981f6a7476477ce06c08b93f2c2 (diff) | |
| download | qpid-python-135cf5d93b7052bdf7c02dc61d4c590c6fba06fa.tar.gz | |
QPID-4588: Fix all Swig descriptors to look in qpid and qmf subdirs.
Updated the CMake files to also install the descriptors to the
appropriate locations.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1447496 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 350b430fdb..c9b882e478 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -68,14 +68,14 @@ 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 bindings/swig_perl_typemaps.i +install(FILES include/qpid/qpid.i + bindings/swig_perl_typemaps.i bindings/swig_python_typemaps.i bindings/swig_ruby_typemaps.i - DESTINATION ${QPID_INSTALL_DATADIR}) -install(FILES include/qpid/qpid.i - include/qmf/qmfengine.i + DESTINATION ${QPID_INSTALL_DATADIR}/qpid) +install(FILES include/qmf/qmfengine.i include/qmf/qmf2.i - DESTINATION ${QPID_INSTALL_INCLUDEDIR}) + DESTINATION ${QPID_INSTALL_INCLUDEDIR}/qmf) if (WIN32) set (CMAKE_DEBUG_POSTFIX "d") |