[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4192-g700965a
Stephen Kelly
steveire at gmail.com
Sun Sep 15 13:22:42 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 700965ad521cb912c36fd3c505ece55d9857e81a (commit)
via ea5dcee58e0048fdd9e63387f66a9f6a61e635eb (commit)
from d0e963c3501e03b43c54b3d7f152bf10c7a0960a (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=700965ad521cb912c36fd3c505ece55d9857e81a
commit 700965ad521cb912c36fd3c505ece55d9857e81a
Merge: d0e963c ea5dcee
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 15 13:22:40 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Sep 15 13:22:40 2013 -0400
Merge topic 'INTERFACE_LIBRARY-target-type' into next
ea5dcee Add missing 'break' in switch.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea5dcee58e0048fdd9e63387f66a9f6a61e635eb
commit ea5dcee58e0048fdd9e63387f66a9f6a61e635eb
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 15 19:19:50 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Sep 15 19:19:50 2013 +0200
Add missing 'break' in switch.
Don't follow
add_library(... UNKNOWN IMPORTED)
with
add_library(... INTERFACE IMPORTED)
The Qt4 IMPORTED targets are of UNKNOWN type, so this
caused double-target-defintion errors.
http://thread.gmane.org/gmane.comp.kde.devel.buildsystem/7968
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 8abdd1f..8c841cb 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -889,6 +889,7 @@ cmExportFileGenerator
break;
case cmTarget::UNKNOWN_LIBRARY:
os << "add_library(" << targetName << " UNKNOWN IMPORTED)\n";
+ break;
case cmTarget::INTERFACE_LIBRARY:
os << "add_library(" << targetName << " INTERFACE IMPORTED)\n";
break;
-----------------------------------------------------------------------
Summary of changes:
Source/cmExportFileGenerator.cxx | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list