svn commit: r924425 - in /qpid/trunk/qpid/cpp: BuildInstallSettings.cmake src/CMakeLists.txt src/qpid/Version.h.cmake

[ac...@apache.org]

Author: aconway
Date: Wed Mar 17 19:16:36 2010
New Revision: 924425

URL: http://svn.apache.org/viewvc?rev=924425&view=rev
Log:
Updated cmake build to pick up version from QPID_VERSION.txt.

Added:
    qpid/trunk/qpid/cpp/src/qpid/Version.h.cmake
Modified:
    qpid/trunk/qpid/cpp/BuildInstallSettings.cmake
    qpid/trunk/qpid/cpp/src/CMakeLists.txt

Modified: qpid/trunk/qpid/cpp/BuildInstallSettings.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/BuildInstallSettings.cmake?rev=924425&r1=924424&r2=924425&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/BuildInstallSettings.cmake (original)
+++ qpid/trunk/qpid/cpp/BuildInstallSettings.cmake Wed Mar 17 19:16:36 2010
@@ -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

Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=924425&r1=924424&r2=924425&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Wed Mar 17 19:16:36 2010
@@ -950,6 +950,9 @@ add_definitions(-DHAVE_CONFIG_H)
 # Now create the config file from all the info learned above.
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
                ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+# And create the Version.h file.
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qpid/Version.h.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/qpid/Version.h)
 
 add_subdirectory(qpid/store)
 add_subdirectory(tests)

Added: qpid/trunk/qpid/cpp/src/qpid/Version.h.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/Version.h.cmake?rev=924425&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/Version.h.cmake (added)
+++ qpid/trunk/qpid/cpp/src/qpid/Version.h.cmake Wed Mar 17 19:16:36 2010
@@ -0,0 +1,44 @@
+#ifndef QPID_VERSION_H
+#define QPID_VERSION_H
+
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <string>
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+namespace qpid {
+#ifdef HAVE_CONFIG_H
+  const std::string product  = PACKAGE_NAME;
+  const std::string version  = PACKAGE_VERSION;
+#  if HAVE_SASL
+  const std::string saslName = BROKER_SASL_NAME;
+#  else
+  const std::string saslName = "qpidd-no-sasl";
+#  endif
+#else
+  const std::string product  = "qpidc";
+  const std::string version  = "${QPID_VERSION_MAJOR}.${QPID_VERSION_MINOR}";
+  const std::string saslName = "qpid-broker";
+#endif
+}
+
+#endif  /*!QPID_VERSION_H*/



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org