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 040e28be7c196697a103e19725d1c9ef392d2471 (commit) via fd466d3fd3070b36aadbd7457ddb644b33d40a61 (commit) via 2da3ae3bf76def94d3177f963703e3672ee27f1c (commit) from f090b7818791116d3bd273403a91531e9a14d3fc (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 ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=040e28be7c196697a103e19725d1c9ef392d2471 commit 040e28be7c196697a103e19725d1c9ef392d2471 Merge: f090b78 fd466d3 Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Thu Dec 29 17:12:59 2016 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Dec 29 17:12:59 2016 -0500 Merge topic 'read-only-type-target-property' into next fd466d3f cmTarget: Enforce TYPE being a read-only property 2da3ae3b CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd466d3fd3070b36aadbd7457ddb644b33d40a61 commit fd466d3fd3070b36aadbd7457ddb644b33d40a61 Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Thu Dec 29 23:11:50 2016 +0100 Commit: Gregor Jasny <gja...@googlemail.com> CommitDate: Thu Dec 29 23:11:50 2016 +0100 cmTarget: Enforce TYPE being a read-only property diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index ee4ff39..9261ca8 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -858,6 +858,12 @@ void cmTarget::SetProperty(const std::string& prop, const char* value) this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str()); return; } + if (prop == "TYPE") { + std::ostringstream e; + e << "TYPE property is read-only\n"; + this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str()); + return; + } if (prop == "EXPORT_NAME" && this->IsImported()) { std::ostringstream e; e << "EXPORT_NAME property can't be set on imported targets (\"" diff --git a/Tests/RunCMake/set_property/RunCMakeTest.cmake b/Tests/RunCMake/set_property/RunCMakeTest.cmake index 37c7124..1ddacee 100644 --- a/Tests/RunCMake/set_property/RunCMakeTest.cmake +++ b/Tests/RunCMake/set_property/RunCMakeTest.cmake @@ -6,4 +6,5 @@ run_cmake(COMPILE_OPTIONS) run_cmake(INCLUDE_DIRECTORIES) run_cmake(LINK_LIBRARIES) run_cmake(SOURCES) +run_cmake(TYPE) run_cmake(USER_PROP) diff --git a/Tests/RunCMake/set_property/TYPE-result.txt b/Tests/RunCMake/set_property/TYPE-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/set_property/TYPE-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/set_property/TYPE-stderr.txt b/Tests/RunCMake/set_property/TYPE-stderr.txt new file mode 100644 index 0000000..6226051 --- /dev/null +++ b/Tests/RunCMake/set_property/TYPE-stderr.txt @@ -0,0 +1 @@ +TYPE property is read-only \ No newline at end of file diff --git a/Tests/RunCMake/set_property/TYPE.cmake b/Tests/RunCMake/set_property/TYPE.cmake new file mode 100644 index 0000000..8481266 --- /dev/null +++ b/Tests/RunCMake/set_property/TYPE.cmake @@ -0,0 +1,2 @@ +add_custom_target(CustomTarget) +set_property(TARGET CustomTarget PROPERTY TYPE foo) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- Source/cmTarget.cxx | 6 ++++++ Tests/RunCMake/set_property/RunCMakeTest.cmake | 1 + .../BadSYSROOT-result.txt => set_property/TYPE-result.txt} | 0 Tests/RunCMake/set_property/TYPE-stderr.txt | 1 + Tests/RunCMake/set_property/TYPE.cmake | 2 ++ 6 files changed, 11 insertions(+), 1 deletion(-) copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => set_property/TYPE-result.txt} (100%) create mode 100644 Tests/RunCMake/set_property/TYPE-stderr.txt create mode 100644 Tests/RunCMake/set_property/TYPE.cmake hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits