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 d06f93ac425f3fc61720fb2752111457e4b56431 (commit)
via 876808594963e8b4547e415aaa755cb115eb1bed (commit)
from 9407f9732a9c7b32b5689094cbd29a3a74a0d6a5 (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=d06f93ac425f3fc61720fb2752111457e4b56431
commit d06f93ac425f3fc61720fb2752111457e4b56431
Merge: 9407f97 8768085
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Oct 20 18:53:07 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Oct 20 18:53:07 2015 -0400
Merge topic 'use-generator-target' into next
87680859 fixup! cmGeneratorTarget: Move GetExportMacro from cmTarget.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=876808594963e8b4547e415aaa755cb115eb1bed
commit 876808594963e8b4547e415aaa755cb115eb1bed
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Oct 21 00:51:57 2015 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Wed Oct 21 00:51:57 2015 +0200
fixup! cmGeneratorTarget: Move GetExportMacro from cmTarget.
diff --git a/Source/cmLocalVisualStudio6Generator.cxx
b/Source/cmLocalVisualStudio6Generator.cxx
index 314d9bf..a51eb67 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1543,7 +1543,7 @@ void cmLocalVisualStudio6Generator
// Add the export symbol definition for shared library objects.
std::string exportSymbol;
- if(const char* exportMacro = target->GetExportMacro())
+ if(const char* exportMacro = gt->GetExportMacro())
{
exportSymbol = exportMacro;
}
diff --git a/Source/cmLocalVisualStudio7Generator.cxx
b/Source/cmLocalVisualStudio7Generator.cxx
index 5e76f8a..819998c 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -777,7 +777,7 @@ void
cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
targetOptions.AddDefine(configDefine);
// Add the export symbol definition for shared library objects.
- if(const char* exportMacro = target->GetExportMacro())
+ if(const char* exportMacro = gt->GetExportMacro())
{
targetOptions.AddDefine(exportMacro);
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmLocalVisualStudio6Generator.cxx | 2 +-
Source/cmLocalVisualStudio7Generator.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
