[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3596-gc74a3c2

Stephen Kelly steveire at gmail.com
Fri Aug 2 06:47:53 EDT 2013


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  c74a3c226bc5f59b90729a0172affb78beffd1bd (commit)
       via  8622c6123f662e3aac00ccc33348e8a6a8a1f6ac (commit)
       via  c2e74166d4f96c87193fcdf8b4bd5a692178a4a8 (commit)
       via  e801255530e6dfe47366af7ef6930160ba664219 (commit)
      from  0c1a35e1dca13ad5547dfae722c3dffd339a501d (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=c74a3c226bc5f59b90729a0172affb78beffd1bd
commit c74a3c226bc5f59b90729a0172affb78beffd1bd
Merge: 0c1a35e 8622c61
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Aug 2 06:47:42 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 2 06:47:42 2013 -0400

    Merge topic 'ALIAS-targets' into next
    
    8622c61 Avoid warning about redefinition of type.
    c2e7416 Don't use std::distance.
    e801255 Add missing files.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8622c6123f662e3aac00ccc33348e8a6a8a1f6ac
commit 8622c6123f662e3aac00ccc33348e8a6a8a1f6ac
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Aug 2 12:43:34 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Aug 2 12:45:58 2013 +0200

    Avoid warning about redefinition of type.

diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index 92e3515..cbc6ed1 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -147,11 +147,11 @@ bool cmAddLibraryCommand
       this->SetError(e.str().c_str());
       return false;
       }
-    cmTarget::TargetType type = aliasedTarget->GetType();
-    if(type != cmTarget::SHARED_LIBRARY
-        && type != cmTarget::STATIC_LIBRARY
-        && type != cmTarget::MODULE_LIBRARY
-        && type != cmTarget::OBJECT_LIBRARY)
+    cmTarget::TargetType aliasedType = aliasedTarget->GetType();
+    if(aliasedType != cmTarget::SHARED_LIBRARY
+        && aliasedType != cmTarget::STATIC_LIBRARY
+        && aliasedType != cmTarget::MODULE_LIBRARY
+        && aliasedType != cmTarget::OBJECT_LIBRARY)
       {
       cmOStringStream e;
       e << "cannot create ALIAS target \"" << libName

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2e74166d4f96c87193fcdf8b4bd5a692178a4a8
commit c2e74166d4f96c87193fcdf8b4bd5a692178a4a8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Aug 2 12:42:53 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Aug 2 12:45:58 2013 +0200

    Don't use std::distance.
    
    Apparently suncc does not have a working implementation.

diff --git a/Source/cmAddExecutableCommand.cxx b/Source/cmAddExecutableCommand.cxx
index 049f999..5785259 100644
--- a/Source/cmAddExecutableCommand.cxx
+++ b/Source/cmAddExecutableCommand.cxx
@@ -106,7 +106,7 @@ bool cmAddExecutableCommand
       this->SetError("IMPORTED with ALIAS is not allowed.");
       return false;
       }
-    if(std::distance(s, args.end()) != 1)
+    if(args.size() != 3)
       {
       cmOStringStream e;
       e << "ALIAS requires exactly one target argument.";
diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index 1f5fe46..92e3515 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -119,7 +119,7 @@ bool cmAddLibraryCommand
       this->SetError("IMPORTED with ALIAS is not allowed.");
       return false;
       }
-    if(std::distance(s, args.end()) != 1)
+    if(args.size() != 3)
       {
       cmOStringStream e;
       e << "ALIAS requires exactly one target argument.";

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e801255530e6dfe47366af7ef6930160ba664219
commit e801255530e6dfe47366af7ef6930160ba664219
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Aug 2 12:45:43 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Aug 2 12:45:58 2013 +0200

    Add missing files.

diff --git a/Tests/AliasTarget/object.cpp b/Tests/AliasTarget/object.cpp
new file mode 100644
index 0000000..df09c20
--- /dev/null
+++ b/Tests/AliasTarget/object.cpp
@@ -0,0 +1,5 @@
+
+int object(void)
+{
+  return 0;
+}
diff --git a/Tests/AliasTarget/object.h b/Tests/AliasTarget/object.h
new file mode 100644
index 0000000..e935f14
--- /dev/null
+++ b/Tests/AliasTarget/object.h
@@ -0,0 +1,4 @@
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int object(void);

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

Summary of changes:
 Source/cmAddExecutableCommand.cxx                  |    2 +-
 Source/cmAddLibraryCommand.cxx                     |   12 ++++++------
 .../TestTarExec.cxx => AliasTarget/object.cpp}     |    4 ++--
 .../cmp0022/staticlib2.h => AliasTarget/object.h}  |    2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
 copy Tests/{TarTest/TestTarExec.cxx => AliasTarget/object.cpp} (50%)
 copy Tests/{CMakeCommands/target_link_libraries/cmp0022/staticlib2.h => AliasTarget/object.h} (70%)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list