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 669d1d4d10fb87511f67edc04ab7599974fb9ed5 (commit)
via ff3d5fae5d8549ff1966acc1f883cc1ddb061d61 (commit)
from 4d8a9a595c6163eee2b53fabdd9d3847a8116f41 (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=669d1d4d10fb87511f67edc04ab7599974fb9ed5
commit 669d1d4d10fb87511f67edc04ab7599974fb9ed5
Merge: 4d8a9a5 ff3d5fa
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Fri Jul 26 07:10:20 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Jul 26 07:10:20 2013 -0400
Merge topic 'minor-cleanups' into next
ff3d5fa Export: Fix typo of LINK_INTERFACE_LIBRARIES.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff3d5fae5d8549ff1966acc1f883cc1ddb061d61
commit ff3d5fae5d8549ff1966acc1f883cc1ddb061d61
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Fri Jul 26 12:12:13 2013 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Fri Jul 26 13:10:06 2013 +0200
Export: Fix typo of LINK_INTERFACE_LIBRARIES.
Refer correctly to the old property, not the new one.
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 4de1aae..ab9744b 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -636,7 +636,7 @@ cmExportFileGenerator
cmMakefile *mf = target->GetMakefile();
cmOStringStream e;
e << "Target \"" << target->GetName() << "\" has policy CMP0022 enabled, "
- "but also has old-style INTERFACE_LINK_LIBRARIES properties "
+ "but also has old-style LINK_INTERFACE_LIBRARIES properties "
"populated, but it was exported without the "
"EXPORT_LINK_INTERFACE_LIBRARIES to export the old-style properties";
mf->IssueMessage(cmake::FATAL_ERROR, e.str());
diff --git a/Tests/RunCMake/CMP0022/CMP0022-export-stderr.txt
b/Tests/RunCMake/CMP0022/CMP0022-export-stderr.txt
index 6c29057..ae7627e 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-export-stderr.txt
+++ b/Tests/RunCMake/CMP0022/CMP0022-export-stderr.txt
@@ -1,4 +1,4 @@
CMake Error at CMP0022-export.cmake:11 \(export\):
Target "cmp0022NEW" has policy CMP0022 enabled, but also has old-style
- INTERFACE_LINK_LIBRARIES properties populated, but it was exported without
+ LINK_INTERFACE_LIBRARIES properties populated, but it was exported without
the EXPORT_LINK_INTERFACE_LIBRARIES to export the old-style properties
diff --git a/Tests/RunCMake/CMP0022/CMP0022-install-export-stderr.txt
b/Tests/RunCMake/CMP0022/CMP0022-install-export-stderr.txt
index 3425e8e..405dd8d 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-install-export-stderr.txt
+++ b/Tests/RunCMake/CMP0022/CMP0022-install-export-stderr.txt
@@ -1,4 +1,4 @@
CMake Error in CMakeLists.txt:
Target "cmp0022NEW" has policy CMP0022 enabled, but also has old-style
- INTERFACE_LINK_LIBRARIES properties populated, but it was exported without
+ LINK_INTERFACE_LIBRARIES properties populated, but it was exported without
the EXPORT_LINK_INTERFACE_LIBRARIES to export the old-style properties
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
