[Cmake-commits] CMake branch, next, updated. v3.7.1-1883-g07d6480

[Brad King]

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  07d64808b353bb14faa959596f0489a17f5f85f6 (commit)
       via  567a4fe9b1984d5c770afab8bd677bcee3841659 (commit)
      from  d497b25dcc2d84a7222b32182586ecc4995221ec (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=07d64808b353bb14faa959596f0489a17f5f85f6
commit 07d64808b353bb14faa959596f0489a17f5f85f6
Merge: d497b25 567a4fe
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:01:55 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 9 16:01:55 2017 -0500

    Merge topic 'read-only-type-target-property' into next
    
    567a4fe9 Revert "cmTarget: Enforce TYPE being a read-only property"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=567a4fe9b1984d5c770afab8bd677bcee3841659
commit 567a4fe9b1984d5c770afab8bd677bcee3841659
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:01:40 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 9 16:01:40 2017 -0500

    Revert "cmTarget: Enforce TYPE being a read-only property"
    
    This reverts commit fd466d3fd3070b36aadbd7457ddb644b33d40a61.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 9261ca8..ee4ff39 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -858,12 +858,6 @@ 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 1ddacee..37c7124 100644
--- a/Tests/RunCMake/set_property/RunCMakeTest.cmake
+++ b/Tests/RunCMake/set_property/RunCMakeTest.cmake
@@ -6,5 +6,4 @@ 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
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/set_property/TYPE-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/set_property/TYPE-stderr.txt b/Tests/RunCMake/set_property/TYPE-stderr.txt
deleted file mode 100644
index 6226051..0000000
--- a/Tests/RunCMake/set_property/TYPE-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 8481266..0000000
--- a/Tests/RunCMake/set_property/TYPE.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-add_custom_target(CustomTarget)
-set_property(TARGET CustomTarget PROPERTY TYPE foo)

-----------------------------------------------------------------------

Summary of changes:
 Source/cmTarget.cxx                            |    6 ------
 Tests/RunCMake/set_property/RunCMakeTest.cmake |    1 -
 Tests/RunCMake/set_property/TYPE-result.txt    |    1 -
 Tests/RunCMake/set_property/TYPE-stderr.txt    |    1 -
 Tests/RunCMake/set_property/TYPE.cmake         |    2 --
 5 files changed, 11 deletions(-)
 delete mode 100644 Tests/RunCMake/set_property/TYPE-result.txt
 delete mode 100644 Tests/RunCMake/set_property/TYPE-stderr.txt
 delete mode 100644 Tests/RunCMake/set_property/TYPE.cmake


hooks/post-receive
-- 
CMake