This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via dadb32e4da4f7cd39e0b0e7eba1f46659ac3f6a0 (commit)
via 9397270d73dc239cde41ddaa9a3f05a75a2cd873 (commit)
from f46d69dc6771cfb8d7b0d5c94e70b7e125416e0c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dadb32e4da4f7cd39e0b0e7eba1f46659ac3f6a0
commit dadb32e4da4f7cd39e0b0e7eba1f46659ac3f6a0
Merge: f46d69d 9397270
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jan 31 11:10:27 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jan 31 11:10:27 2013 -0500
Merge topic 'new-command-class-type-macros' into next
9397270 Fix use of cmTypeMacro in new command classes
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9397270d73dc239cde41ddaa9a3f05a75a2cd873
commit 9397270d73dc239cde41ddaa9a3f05a75a2cd873
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jan 31 09:31:58 2013 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Jan 31 11:08:40 2013 -0500
Fix use of cmTypeMacro in new command classes
Both commit 8a37ebec (Add the target_include_directories command,
2013-01-01) and commit fc61a7a7 (Add the target_compile_definitions
command, 2013-01-08) added command implementations deriving from the new
cmTargetPropCommandBase class. Fix cmTypeMacro declarations of the
inheritance relationship.
diff --git a/Source/cmTargetCompileDefinitionsCommand.h
b/Source/cmTargetCompileDefinitionsCommand.h
index 3b43820..c93cacb 100644
--- a/Source/cmTargetCompileDefinitionsCommand.h
+++ b/Source/cmTargetCompileDefinitionsCommand.h
@@ -75,7 +75,7 @@ public:
;
}
- cmTypeMacro(cmTargetCompileDefinitionsCommand, cmCommand);
+ cmTypeMacro(cmTargetCompileDefinitionsCommand, cmTargetPropCommandBase);
private:
virtual void HandleImportedTarget(const std::string &tgt);
diff --git a/Source/cmTargetIncludeDirectoriesCommand.h
b/Source/cmTargetIncludeDirectoriesCommand.h
index d02cb4a..2bc7bef 100644
--- a/Source/cmTargetIncludeDirectoriesCommand.h
+++ b/Source/cmTargetIncludeDirectoriesCommand.h
@@ -79,7 +79,7 @@ public:
;
}
- cmTypeMacro(cmTargetIncludeDirectoriesCommand, cmCommand);
+ cmTypeMacro(cmTargetIncludeDirectoriesCommand, cmTargetPropCommandBase);
private:
virtual void HandleImportedTarget(const std::string &tgt);
diff --git a/Source/cmTargetPropCommandBase.h b/Source/cmTargetPropCommandBase.h
index a5b4ff8..8047a48 100644
--- a/Source/cmTargetPropCommandBase.h
+++ b/Source/cmTargetPropCommandBase.h
@@ -31,6 +31,7 @@ public:
bool HandleArguments(std::vector<std::string> const& args,
const char *prop, ArgumentFlags flags = NO_FLAGS);
+ cmTypeMacro(cmTargetPropCommandBase, cmCommand);
protected:
std::string Property;
cmTarget *Target;
-----------------------------------------------------------------------
Summary of changes:
Source/cmTargetCompileDefinitionsCommand.h | 2 +-
Source/cmTargetIncludeDirectoriesCommand.h | 2 +-
Source/cmTargetPropCommandBase.h | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
