diff options
| author | Alan Conway <aconway@apache.org> | 2010-03-17 19:16:36 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-03-17 19:16:36 +0000 |
| commit | a9a154a8c5f2d7e430249e1133922ba196b53210 (patch) | |
| tree | 755752add9b6f702ccd674ae505bf5a7e2b506d0 /cpp/BuildInstallSettings.cmake | |
| parent | 707ba1c7b83750d174f5455990ea0a06e86daa79 (diff) | |
| download | qpid-python-a9a154a8c5f2d7e430249e1133922ba196b53210.tar.gz | |
Updated cmake build to pick up version from QPID_VERSION.txt.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@924425 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/BuildInstallSettings.cmake')
| -rw-r--r-- | cpp/BuildInstallSettings.cmake | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/cpp/BuildInstallSettings.cmake b/cpp/BuildInstallSettings.cmake index 60d6b14e11..c1cf2bcba2 100644 --- a/cpp/BuildInstallSettings.cmake +++ b/cpp/BuildInstallSettings.cmake @@ -20,8 +20,17 @@ # Settings related to the Qpid build and install CMake/CTest/CPack procedure.
# These are used by both the C++ and WCF components.
-set (QPID_VERSION_MAJOR 0)
-set (QPID_VERSION_MINOR 6)
+# Parse the version from QPID_VERSION.txt. +# Use the top level qpid/ file if we're in an SVN checkout, source dir otherwise. +if(EXISTS "${PROJECT_SOURCE_DIR}/../QPID_VERSION.txt") + file(READ "${PROJECT_SOURCE_DIR}/../QPID_VERSION.txt" QPID_VERSION) +elseif (EXISTS "${PROJECT_SOURCE_DIR}/QPID_VERSION.txt") + file(READ "${PROJECT_SOURCE_DIR}/QPID_VERSION.txt" QPID_VERSION) +else() + message(FATAL_ERROR "Cannot find QPID_VERSION.txt") +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}") # 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
|