[Cmake-commits] CMake branch, next, updated. v2.8.9-3057-g1c6cf47
Brad King
brad.king at kitware.com
Mon Aug 13 09:05:41 EDT 2012
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 1c6cf47bc197b58fe5ff949c51042a3d849f92c4 (commit)
via 0b07930a35b2527323de37d63e523460534223a8 (commit)
from dfee3ecc46cafcbc3e66972a23c14cb933aa621b (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=1c6cf47bc197b58fe5ff949c51042a3d849f92c4
commit 1c6cf47bc197b58fe5ff949c51042a3d849f92c4
Merge: dfee3ec 0b07930
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 13 09:05:38 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 13 09:05:38 2012 -0400
Merge topic 'fix_vs10_rerunning_custom_targets' into next
0b07930 Revert "VS 10 requires that symbolic files for custom targets exist."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b07930a35b2527323de37d63e523460534223a8
commit 0b07930a35b2527323de37d63e523460534223a8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 13 09:04:52 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 13 09:04:52 2012 -0400
Revert "VS 10 requires that symbolic files for custom targets exist."
This reverts commit e16f58ddd6aea9bebc6b4a914eed54cf7517ff61.
Sources marked SYMBOLIC are supposed to build every time. They are
"symbolic" output names because they are not really created.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 396158b..9a97ab0 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -571,24 +571,6 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
{
cmSourceFile* sf = *s;
std::string const& source = sf->GetFullPath();
- // VS 10 will always rebuild a custom target if its symbolic
- // file doesn't exist so create the file explicitly.
- if(sf->GetPropertyAsBool("SYMBOLIC"))
- {
- if(!cmSystemTools::FileExists(source.c_str()))
- {
- // Make sure the path exists for the file
- std::string path = cmSystemTools::GetFilenamePath(source);
- cmSystemTools::MakeDirectory(path.c_str());
- std::ofstream fout(source.c_str());
- if(fout)
- {
- fout << "# generated from CMake\n";
- fout.flush();
- fout.close();
- }
- }
- }
cmSourceGroup& sourceGroup =
this->Makefile->FindSourceGroup(source.c_str(), sourceGroups);
groupsUsed.insert(&sourceGroup);
-----------------------------------------------------------------------
Summary of changes:
Source/cmVisualStudio10TargetGenerator.cxx | 18 ------------------
1 files changed, 0 insertions(+), 18 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list