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/src | |
| 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/src')
| -rw-r--r-- | cpp/src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | cpp/src/qpid/Version.h.cmake | 44 |
2 files changed, 47 insertions, 0 deletions
diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index 1ebfa9e3ca..e1681ab961 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -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) diff --git a/cpp/src/qpid/Version.h.cmake b/cpp/src/qpid/Version.h.cmake new file mode 100644 index 0000000000..b9c3d1619f --- /dev/null +++ b/cpp/src/qpid/Version.h.cmake @@ -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*/ |