From f6b9deba884ee5f331fff4de48830336a39c0008 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 17 Mar 2010 19:25:51 +0000 Subject: Remove un-necessary Version.h.cmake git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@924428 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/CMakeLists.txt | 4 ---- cpp/src/qpid/Version.h.cmake | 44 -------------------------------------------- 2 files changed, 48 deletions(-) delete mode 100644 cpp/src/qpid/Version.h.cmake (limited to 'cpp/src') diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index e1681ab961..b09309cb9c 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -950,9 +950,5 @@ 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 deleted file mode 100644 index b9c3d1619f..0000000000 --- a/cpp/src/qpid/Version.h.cmake +++ /dev/null @@ -1,44 +0,0 @@ -#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 - -#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*/ -- cgit v1.2.1