[cmake-commits] king committed cmGlobalVisualStudio8Generator.cxx
1.24 1.25 cmLocalVisualStudio7Generator.cxx 1.203 1.204
cmLocalVisualStudio7Generator.h 1.43 1.44
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Nov 12 15:42:39 EST 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv2519/Source
Modified Files:
cmGlobalVisualStudio8Generator.cxx
cmLocalVisualStudio7Generator.cxx
cmLocalVisualStudio7Generator.h
Log Message:
BUG: Converted per-vcproj timestamp to a single directory-level CMakeFiles/generate.stamp file shared by all targets in each directory. This avoids having all targets overwrite each others timestamp check rules and instead has one single rule.
Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -d -r1.203 -r1.204
--- cmLocalVisualStudio7Generator.cxx 10 Nov 2007 13:15:13 -0000 1.203
+++ cmLocalVisualStudio7Generator.cxx 12 Nov 2007 20:42:37 -0000 1.204
@@ -58,7 +58,8 @@
void cmLocalVisualStudio7Generator::Generate()
{
- this->OutputVCProjFile();
+ this->WriteProjectFiles();
+ this->WriteStampFiles();
}
void cmLocalVisualStudio7Generator::FixGlobalTargets()
@@ -99,7 +100,7 @@
// TODO
// for CommandLine= need to repleace quotes with "
// write out configurations
-void cmLocalVisualStudio7Generator::OutputVCProjFile()
+void cmLocalVisualStudio7Generator::WriteProjectFiles()
{
// If not an in source build, then create the output directory
if(strcmp(this->Makefile->GetStartOutputDirectory(),
@@ -113,23 +114,28 @@
}
}
- // Create the VCProj or set of VCProj's for libraries and executables
-
+ // Get the set of targets in this directory.
cmTargets &tgts = this->Makefile->GetTargets();
- for(cmTargets::iterator l = tgts.begin();
- l != tgts.end(); l++)
+
+ // Create the regeneration custom rule.
+ if(!this->Makefile->IsOn("CMAKE_SUPPRESS_REGENERATION"))
{
- // Add a rule to regenerate the build system when the target
+ // Create a rule to regenerate the build system when the target
// specification source changes.
- const char* suppRegenRule =
- this->Makefile->GetDefinition("CMAKE_SUPPRESS_REGENERATION");
- if (!cmSystemTools::IsOn(suppRegenRule) &&
- (strcmp(l->first.c_str(), CMAKE_CHECK_BUILD_SYSTEM_TARGET) != 0))
+ if(cmSourceFile* sf = this->CreateVCProjBuildRule())
{
- this->AddVCProjBuildRule(l->second);
+ // Add the rule to targets that need it.
+ for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
+ {
+ if(l->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
+ {
+ l->second.AddSourceFile(sf);
+ }
+ }
}
}
+ // Create the project file for each target.
for(cmTargets::iterator l = tgts.begin();
l != tgts.end(); l++)
{
@@ -142,6 +148,38 @@
}
}
+//----------------------------------------------------------------------------
+void cmLocalVisualStudio7Generator::WriteStampFiles()
+{
+ // Touch a timestamp file used to determine when the project file is
+ // out of date.
+ std::string stampName = this->Makefile->GetStartOutputDirectory();
+ stampName += cmake::GetCMakeFilesDirectory();
+ cmSystemTools::MakeDirectory(stampName.c_str());
+ stampName += "/";
+ stampName += "generate.stamp";
+ std::ofstream stamp(stampName.c_str());
+ stamp << "# CMake generation timestamp file this directory.\n";
+
+ // Create a helper file so CMake can determine when it is run
+ // through the rule created by CreateVCProjBuildRule whether it
+ // really needs to regenerate the project. This file lists its own
+ // dependencies. If any file listed in it is newer than itself then
+ // CMake must rerun. Otherwise the project files are up to date and
+ // the stamp file can just be touched.
+ std::string depName = stampName;
+ depName += ".depend";
+ std::ofstream depFile(depName.c_str());
+ depFile << "# CMake generation dependency list for this directory.\n";
+ std::vector<std::string> const& listFiles = this->Makefile->GetListFiles();
+ for(std::vector<std::string>::const_iterator lf = listFiles.begin();
+ lf != listFiles.end(); ++lf)
+ {
+ depFile << *lf << std::endl;
+ }
+}
+
+//----------------------------------------------------------------------------
void cmLocalVisualStudio7Generator
::CreateSingleVCProj(const char *lname, cmTarget &target)
{
@@ -158,54 +196,16 @@
// Generate the project file and replace it atomically with
// copy-if-different. We use a separate timestamp so that the IDE
// does not reload project files unnecessarily.
- {
cmGeneratedFileStream fout(fname.c_str());
fout.SetCopyIfDifferent(true);
this->WriteVCProjFile(fout,lname,target);
- }
-
- // Create a helper file so CMake can determine when it is run
- // through the rule created by AddVCProjBuildRule whether it really
- // needs to regenerate the project. This file lists its own
- // dependencies. If any file listed in it is newer than itself then
- // CMake must rerun. Otherwise the project file is up to date and
- // the stamp file can just be touched.
- {
- std::string depName = this->Makefile->GetStartOutputDirectory();
- depName += cmake::GetCMakeFilesDirectory();
- depName += "/";
- depName += lname;
- depName += ".vcproj.stamp.depend";
- std::ofstream depFile(depName.c_str());
- depFile << "# CMake dependency list for corresponding VS project.\n";
- std::vector<std::string> const& listFiles = this->Makefile->GetListFiles();
- for(std::vector<std::string>::const_iterator lf = listFiles.begin();
- lf != listFiles.end(); ++lf)
- {
- depFile << *lf << std::endl;
- }
- }
-
- // Touch a timestamp file used to determine when the project file is
- // out of date.
- {
- std::string stampName = this->Makefile->GetStartOutputDirectory();
- stampName += cmake::GetCMakeFilesDirectory();
- cmSystemTools::MakeDirectory(stampName.c_str());
- stampName += "/";
- stampName += lname;
- stampName += ".vcproj.stamp";
- std::ofstream stamp(stampName.c_str());
- stamp << "# CMake timestamp file for corresponding VS project.\n";
- }
}
-
-void cmLocalVisualStudio7Generator::AddVCProjBuildRule(cmTarget& tgt)
+//----------------------------------------------------------------------------
+cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
{
std::string stampName = cmake::GetCMakeFilesDirectoryPostSlash();
- stampName += tgt.GetName();
- stampName += ".vcproj.stamp";
+ stampName += "generate.stamp";
const char* dsprule =
this->Makefile->GetRequiredDefinition("CMAKE_COMMAND");
cmCustomCommandLine commandLine;
@@ -240,15 +240,15 @@
no_working_directory, true);
if(cmSourceFile* file = this->Makefile->GetSource(makefileIn.c_str()))
{
- tgt.AddSourceFile(file);
+ return file;
}
else
{
cmSystemTools::Error("Error adding rule for ", makefileIn.c_str());
+ return 0;
}
}
-
void cmLocalVisualStudio7Generator::WriteConfigurations(std::ostream& fout,
const char *libName,
cmTarget &target)
Index: cmLocalVisualStudio7Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- cmLocalVisualStudio7Generator.h 17 Sep 2007 19:20:54 -0000 1.43
+++ cmLocalVisualStudio7Generator.h 12 Nov 2007 20:42:37 -0000 1.44
@@ -73,14 +73,15 @@
std::string GetBuildTypeLinkerFlags(std::string rootLinkerFlags,
const char* configName);
void FixGlobalTargets();
- void OutputVCProjFile();
+ void WriteProjectFiles();
+ void WriteStampFiles();
void WriteVCProjHeader(std::ostream& fout, const char *libName,
cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
void WriteVCProjFooter(std::ostream& fout);
void CreateSingleVCProj(const char *lname, cmTarget &tgt);
void WriteVCProjFile(std::ostream& fout, const char *libName,
cmTarget &tgt);
- void AddVCProjBuildRule(cmTarget& tgt);
+ cmSourceFile* CreateVCProjBuildRule();
void WriteConfigurations(std::ostream& fout,
const char *libName, cmTarget &tgt);
void WriteConfiguration(std::ostream& fout,
Index: cmGlobalVisualStudio8Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio8Generator.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- cmGlobalVisualStudio8Generator.cxx 10 Nov 2007 13:15:13 -0000 1.24
+++ cmGlobalVisualStudio8Generator.cxx 12 Nov 2007 20:42:37 -0000 1.25
@@ -125,7 +125,7 @@
// Create a rule to re-run CMake.
std::string stampName = cmake::GetCMakeFilesDirectoryPostSlash();
- stampName += CMAKE_CHECK_BUILD_SYSTEM_TARGET ".vcproj.stamp";
+ stampName += "generate.stamp";
const char* dsprule = mf->GetRequiredDefinition("CMAKE_COMMAND");
cmCustomCommandLine commandLine;
commandLine.push_back(dsprule);
@@ -146,8 +146,8 @@
// Add the rule. Note that we cannot use the CMakeLists.txt
// file as the main dependency because it would get
- // overwritten by the AddVCProjBuildRule of the ALL_BUILD
- // target.
+ // overwritten by the CreateVCProjBuildRule.
+ // (this could be avoided with per-target source files)
const char* no_main_dependency = 0;
const char* no_working_directory = 0;
mf->AddCustomCommandToOutput(
More information about the Cmake-commits
mailing list