[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4289-g4b60ee4

[Stephen Kelly]

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  4b60ee4e5d484947cec8aeaeeb43a498de15ce2e (commit)
       via  41c2c30ddd44c1933c3e23f5170971ae4d03963a (commit)
      from  4030ef52205582fe55509bd02f818f32ee2044d7 (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=4b60ee4e5d484947cec8aeaeeb43a498de15ce2e
commit 4b60ee4e5d484947cec8aeaeeb43a498de15ce2e
Merge: 4030ef5 41c2c30
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Sep 24 03:41:03 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 24 03:41:03 2013 -0400

    Merge topic 'allow-alias-imported-targets' into next
    
    41c2c30 Allow ALIAS targets to alias IMPORTED targets.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41c2c30ddd44c1933c3e23f5170971ae4d03963a
commit 41c2c30ddd44c1933c3e23f5170971ae4d03963a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Sep 24 09:38:59 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Sep 24 09:38:59 2013 +0200

    Allow ALIAS targets to alias IMPORTED targets.
    
    This allows source compatibility such as making Qt4::Core an alias
    of Qt5::Core during porting.
    
    A future patch will allow deprecation of IMPORTED targets, so using
    Qt4::Core in the above case would issue a message.

diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index cbc6ed1..6fd70bf 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -159,14 +159,6 @@ bool cmAddLibraryCommand
       this->SetError(e.str().c_str());
       return false;
       }
-    if(aliasedTarget->IsImported())
-      {
-      cmOStringStream e;
-      e << "cannot create ALIAS target \"" << libName
-        << "\" because target \"" << aliasedName << "\" is IMPORTED.";
-      this->SetError(e.str().c_str());
-      return false;
-      }
     this->Makefile->AddAlias(libName.c_str(), aliasedTarget);
     return true;
     }
diff --git a/Tests/RunCMake/alias_targets/imported-target-result.txt b/Tests/RunCMake/alias_targets/imported-target-result.txt
index d00491f..573541a 100644
--- a/Tests/RunCMake/alias_targets/imported-target-result.txt
+++ b/Tests/RunCMake/alias_targets/imported-target-result.txt
@@ -1 +1 @@
-1
+0
diff --git a/Tests/RunCMake/alias_targets/imported-target-stderr.txt b/Tests/RunCMake/alias_targets/imported-target-stderr.txt
index bbff29a..10f3293 100644
--- a/Tests/RunCMake/alias_targets/imported-target-stderr.txt
+++ b/Tests/RunCMake/alias_targets/imported-target-stderr.txt
@@ -1,5 +1 @@
-CMake Error at imported-target.cmake:6 \(add_library\):
-  add_library cannot create ALIAS target "alias" because target "foo" is
-  IMPORTED.
-Call Stack \(most recent call first\):
-  CMakeLists.txt:3 \(include\)
+^$

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

Summary of changes:
 Source/cmAddLibraryCommand.cxx                     |    8 --------
 .../alias_targets/imported-target-result.txt       |    2 +-
 .../alias_targets/imported-target-stderr.txt       |    6 +-----
 3 files changed, 2 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
CMake