From 0b87e564b668dc4e287f7cf57a97d1bcd555be50 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 17 Mar 2010 19:16:36 +0000 Subject: 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 --- qpid/cpp/BuildInstallSettings.cmake | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/BuildInstallSettings.cmake') 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 -- cgit v1.2.1