[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1094-ge1cff3e
Stephen Kelly
steveire at gmail.com
Tue Oct 27 02:43:52 EDT 2015
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 e1cff3e94cf6d46776d33d0ebe83aaf826bc0037 (commit)
via e45be64386ea6974c27e58f8253a7144956fd767 (commit)
via 4960ce1287665ddbaec12424c722f4d0018a7756 (commit)
from f94ceec95d7444fc6d4f151f8d8a07643ec27db6 (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=e1cff3e94cf6d46776d33d0ebe83aaf826bc0037
commit e1cff3e94cf6d46776d33d0ebe83aaf826bc0037
Merge: f94ceec e45be64
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 27 02:43:51 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 27 02:43:51 2015 -0400
Merge topic 'use-generator-target' into next
e45be643 fixup! cmTarget: Make compatbility API explicit.
4960ce12 fixup! cmGlobalGenerator: Remove direct storage of targets
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e45be64386ea6974c27e58f8253a7144956fd767
commit e45be64386ea6974c27e58f8253a7144956fd767
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 27 07:42:07 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:42:07 2015 +0100
fixup! cmTarget: Make compatbility API explicit.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 35c6084..ffe92af 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -747,7 +747,7 @@ void cmMakefile::ConfigureFinalPass()
// system generation uses up-to-date information even if other cache
// invalidation code in this source file is buggy.
- l->second.AnalyzeLibDependenciesForVS6(this);
+ l->second.AnalyzeLibDependenciesForVS6(*this);
}
}
#endif
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4960ce1287665ddbaec12424c722f4d0018a7756
commit 4960ce1287665ddbaec12424c722f4d0018a7756
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 27 07:41:48 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:41:48 2015 +0100
fixup! cmGlobalGenerator: Remove direct storage of targets
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index b7478f9..5e239b8 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -363,7 +363,7 @@ void cmGlobalVisualStudio8Generator::AddExtraIDETargets()
{
if((*ti)->GetName() != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
{
- (*ti)->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
+ (*ti)->Target->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
}
}
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalVisualStudio8Generator.cxx | 2 +-
Source/cmMakefile.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list