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 | 0b87e564b668dc4e287f7cf57a97d1bcd555be50 (patch) | |
| tree | 36597db4aa842f5ef4f37e58f2977b672766bc3e /qpid/cpp/BuildInstallSettings.cmake | |
| parent | 83fc4edb85d000c2bd33fd4d9bab4c23aac20302 (diff) | |
| download | qpid-python-0b87e564b668dc4e287f7cf57a97d1bcd555be50.tar.gz | |
Updated cmake build to pick up version from QPID_VERSION.txt.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@924425 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/BuildInstallSettings.cmake')
| -rw-r--r-- | qpid/cpp/BuildInstallSettings.cmake | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/qpid/cpp/BuildInstallSettings.cmake b/qpid/cpp/BuildInstallSettings.cmake index 60d6b14e11..c1cf2bcba2 100644 --- a/qpid/cpp/BuildInstallSettings.cmake +++ b/qpid/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
|