diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2012-10-23 18:15:55 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2012-10-23 18:15:55 +0000 |
| commit | ca077b77293c43977c5cea2bab46a306c6108e5f (patch) | |
| tree | 293db6a0723f3bb316380e8953313eb8494f8179 /cpp | |
| parent | aa45a40b1e89d357839f72cd73fd07c8815282c5 (diff) | |
| download | qpid-python-ca077b77293c43977c5cea2bab46a306c6108e5f.tar.gz | |
QPID-3633: Make cmake the primary build tool for the cpp tree
- Fix qpid version number so it doesn't contain newline, this causes
a very odd path for documentation
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1401373 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/BuildInstallSettings.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/BuildInstallSettings.cmake b/cpp/BuildInstallSettings.cmake index ef76624d4c..6bd883e754 100644 --- a/cpp/BuildInstallSettings.cmake +++ b/cpp/BuildInstallSettings.cmake @@ -31,6 +31,7 @@ else() endif(EXISTS "${PROJECT_SOURCE_DIR}/../QPID_VERSION.txt") string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\n" "\\1" QPID_VERSION_MAJOR "${QPID_VERSION}") string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\n" "\\2" QPID_VERSION_MINOR "${QPID_VERSION}") +set (QPID_VERSION_FULL "${QPID_VERSION_MAJOR}.${QPID_VERSION_MINOR}") # When doing installs, there are a number of components that the item can # be associated with. Since there may be different sets of components desired @@ -143,7 +144,7 @@ endfunction(set_absolute_install_path) set (LIB_INSTALL_DIR lib CACHE PATH "Library object file directory") set (SYSCONF_INSTALL_DIR etc CACHE PATH "System read only configuration directory") set (SHARE_INSTALL_DIR share CACHE PATH "Shared read only data directory") - set (DOC_INSTALL_DIR ${SHARE_INSTALL_DIR}/doc/${CMAKE_PROJECT_NAME}-${QPID_VERSION} CACHE PATH "Shared read only data directory") + set (DOC_INSTALL_DIR ${SHARE_INSTALL_DIR}/doc/${CMAKE_PROJECT_NAME}-${QPID_VERSION_FULL} CACHE PATH "Shared read only data directory") set (QPID_COMPONENT_BROKER runtime) set (QPID_COMPONENT_CLIENT runtime) |