[cmake-developers] [PATCH 2/2] Remove cmProperty.{h,cxx}

[David Cole]

What's the motivation here?

This will likely conflict (logically, at compile time) with the
recently merged-to-next topic for the target-include-directories...



On Sat, Feb 25, 2012 at 3:07 AM, Yury G. Kudryashov
<urkud.urkud at gmail.com> wrote:
> From: "Yury G. Kudryashov" <urkud.urkud at gmail.com>
>
> After previous commit cmProperty.h contained only one enum. Move it to
> cmPropertyMap.h.
> ---
>  Source/CMakeLists.txt         |    2 --
>  Source/cmDocumentation.h      |    2 +-
>  Source/cmProperty.h           |   21 ---------------------
>  Source/cmPropertyDefinition.h |    2 +-
>  Source/cmPropertyMap.h        |    7 ++++++-
>  bootstrap                     |    1 -
>  6 files changed, 8 insertions(+), 27 deletions(-)
>  delete mode 100644 Source/cmProperty.cxx
>  delete mode 100644 Source/cmProperty.h
>
> diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
> index 0c420b9..e8404ff 100644
> --- a/Source/CMakeLists.txt
> +++ b/Source/CMakeLists.txt
> @@ -225,8 +225,6 @@ SET(SRCS
>   cmPolicies.cxx
>   cmProcessTools.cxx
>   cmProcessTools.h
> -  cmProperty.cxx
> -  cmProperty.h
>   cmPropertyDefinition.cxx
>   cmPropertyDefinition.h
>   cmPropertyDefinitionMap.cxx
> diff --git a/Source/cmDocumentation.h b/Source/cmDocumentation.h
> index 11bef16..0bf3669 100644
> --- a/Source/cmDocumentation.h
> +++ b/Source/cmDocumentation.h
> @@ -13,7 +13,7 @@
>  #define _cmDocumentation_h
>
>  #include "cmStandardIncludes.h"
> -#include "cmProperty.h"
> +#include "cmPropertyMap.h"
>  #include "cmDocumentationFormatter.h"
>  #include "cmDocumentationFormatterHTML.h"
>  #include "cmDocumentationFormatterDocbook.h"
> diff --git a/Source/cmProperty.cxx b/Source/cmProperty.cxx
> deleted file mode 100644
> index e69de29..0000000
> diff --git a/Source/cmProperty.h b/Source/cmProperty.h
> deleted file mode 100644
> index a2b3219..0000000
> --- a/Source/cmProperty.h
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -/*============================================================================
> -  CMake - Cross Platform Makefile Generator
> -  Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
> -
> -  Distributed under the OSI-approved BSD License (the "License");
> -  see accompanying file Copyright.txt for details.
> -
> -  This software is distributed WITHOUT ANY WARRANTY; without even the
> -  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
> -  See the License for more information.
> -============================================================================*/
> -#ifndef cmProperty_h
> -#define cmProperty_h
> -
> -namespace cmProperty
> -{
> -  enum ScopeType { TARGET, SOURCE_FILE, DIRECTORY, GLOBAL, CACHE,
> -                   TEST, VARIABLE, CACHED_VARIABLE };
> -}
> -
> -#endif
> diff --git a/Source/cmPropertyDefinition.h b/Source/cmPropertyDefinition.h
> index 898e13b..e1c2648 100644
> --- a/Source/cmPropertyDefinition.h
> +++ b/Source/cmPropertyDefinition.h
> @@ -12,7 +12,7 @@
>  #ifndef cmPropertyDefinition_h
>  #define cmPropertyDefinition_h
>
> -#include "cmProperty.h"
> +#include "cmPropertyMap.h"
>  #include "cmStandardIncludes.h"
>
>  class cmPropertyDefinition
> diff --git a/Source/cmPropertyMap.h b/Source/cmPropertyMap.h
> index add5aad..9759a27 100644
> --- a/Source/cmPropertyMap.h
> +++ b/Source/cmPropertyMap.h
> @@ -12,11 +12,16 @@
>  #ifndef cmPropertyMap_h
>  #define cmPropertyMap_h
>
> -#include "cmProperty.h"
>  #include "cmStandardIncludes.h"
>
>  class cmake;
>
> +namespace cmProperty
> +{
> +  enum ScopeType { TARGET, SOURCE_FILE, DIRECTORY, GLOBAL, CACHE,
> +                   TEST, VARIABLE, CACHED_VARIABLE };
> +}
> +
>  class cmPropertyMap : public std::map<cmStdString,cmStdString>
>  {
>  public:
> diff --git a/bootstrap b/bootstrap
> index f5eacbd..327f6c8 100755
> --- a/bootstrap
> +++ b/bootstrap
> @@ -188,7 +188,6 @@ CMAKE_CXX_SOURCES="\
>   cmDocumentationFormatter \
>   cmDocumentationFormatterText \
>   cmPolicies \
> -  cmProperty \
>   cmPropertyMap \
>   cmPropertyDefinition \
>   cmPropertyDefinitionMap \
> --
> 1.7.8
>
> --
>
> Powered by www.kitware.com
>
> Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html
>
> Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ
>
> Follow this link to subscribe/unsubscribe:
> http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers