"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "Source/cmGlobalVisualStudio71Generator.cxx" between
cmake-3.13.4.tar.gz and cmake-3.14.0-rc1.tar.gz

About: CMake is a cross-platform build system designed to build, test and package software. Release candidate.

cmGlobalVisualStudio71Generator.cxx  (cmake-3.13.4):cmGlobalVisualStudio71Generator.cxx  (cmake-3.14.0-rc1)
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */ file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmGlobalVisualStudio71Generator.h" #include "cmGlobalVisualStudio71Generator.h"
#include "cmDocumentationEntry.h" #include "cmDocumentationEntry.h"
#include "cmGeneratorTarget.h" #include "cmGeneratorTarget.h"
#include "cmLocalVisualStudio7Generator.h" #include "cmLocalVisualStudio7Generator.h"
#include "cmMakefile.h" #include "cmMakefile.h"
#include "cmake.h" #include "cmMessageType.h"
cmGlobalVisualStudio71Generator::cmGlobalVisualStudio71Generator( cmGlobalVisualStudio71Generator::cmGlobalVisualStudio71Generator(
cmake* cm, const std::string& platformName) cmake* cm, const std::string& platformName)
: cmGlobalVisualStudio7Generator(cm, platformName) : cmGlobalVisualStudio7Generator(cm, platformName)
{ {
this->ProjectConfigurationSectionName = "ProjectConfiguration"; this->ProjectConfigurationSectionName = "ProjectConfiguration";
} }
void cmGlobalVisualStudio71Generator::WriteSLNFile( void cmGlobalVisualStudio71Generator::WriteSLNFile(
std::ostream& fout, cmLocalGenerator* root, std::ostream& fout, cmLocalGenerator* root,
skipping to change at line 152 skipping to change at line 152
cmGeneratorTarget const* target) cmGeneratorTarget const* target)
{ {
VSDependSet const& depends = this->VSTargetDepends[target]; VSDependSet const& depends = this->VSTargetDepends[target];
for (std::string const& name : depends) { for (std::string const& name : depends) {
std::string guid = this->GetGUID(name); std::string guid = this->GetGUID(name);
if (guid.empty()) { if (guid.empty()) {
std::string m = "Target: "; std::string m = "Target: ";
m += target->GetName(); m += target->GetName();
m += " depends on unknown target: "; m += " depends on unknown target: ";
m += name; m += name;
cmSystemTools::Error(m.c_str()); cmSystemTools::Error(m);
} }
fout << "\t\t{" << guid << "} = {" << guid << "}\n"; fout << "\t\t{" << guid << "} = {" << guid << "}\n";
} }
} }
// Write a dsp file into the SLN file, Note, that dependencies from // Write a dsp file into the SLN file, Note, that dependencies from
// executables to the libraries it uses are also done here // executables to the libraries it uses are also done here
void cmGlobalVisualStudio71Generator::WriteExternalProject( void cmGlobalVisualStudio71Generator::WriteExternalProject(
std::ostream& fout, const std::string& name, const char* location, std::ostream& fout, const std::string& name, const char* location,
const char* typeGuid, const std::set<std::string>& depends) const char* typeGuid, const std::set<BT<std::string>>& depends)
{ {
fout << "Project(\"{" fout << "Project(\"{"
<< (typeGuid ? typeGuid : this->ExternalProjectType(location)) << (typeGuid ? typeGuid : this->ExternalProjectType(location))
<< "}\") = \"" << name << "\", \"" << "}\") = \"" << name << "\", \""
<< this->ConvertToSolutionPath(location) << "\", \"{" << this->ConvertToSolutionPath(location) << "\", \"{"
<< this->GetGUID(name) << "}\"\n"; << this->GetGUID(name) << "}\"\n";
// write out the dependencies here VS 7.1 includes dependencies with the // write out the dependencies here VS 7.1 includes dependencies with the
// project instead of in the global section // project instead of in the global section
if (!depends.empty()) { if (!depends.empty()) {
fout << "\tProjectSection(ProjectDependencies) = postProject\n"; fout << "\tProjectSection(ProjectDependencies) = postProject\n";
for (std::string const& it : depends) { for (BT<std::string> const& it : depends) {
if (!it.empty()) { std::string const& dep = it.Value;
fout << "\t\t{" << this->GetGUID(it) << "} = {" << this->GetGUID(it) if (!dep.empty()) {
fout << "\t\t{" << this->GetGUID(dep) << "} = {" << this->GetGUID(dep)
<< "}\n"; << "}\n";
} }
} }
fout << "\tEndProjectSection\n"; fout << "\tEndProjectSection\n";
} }
fout << "EndProject\n"; fout << "EndProject\n";
} }
// Write a dsp file into the SLN file, Note, that dependencies from // Write a dsp file into the SLN file, Note, that dependencies from
skipping to change at line 219 skipping to change at line 220
fout << "\t\t{" << guid << "}." << i << ".ActiveCfg = " << dstConfig << "|" fout << "\t\t{" << guid << "}." << i << ".ActiveCfg = " << dstConfig << "|"
<< platformName << std::endl; << platformName << std::endl;
std::set<std::string>::const_iterator ci = std::set<std::string>::const_iterator ci =
configsPartOfDefaultBuild.find(i); configsPartOfDefaultBuild.find(i);
if (!(ci == configsPartOfDefaultBuild.end())) { if (!(ci == configsPartOfDefaultBuild.end())) {
fout << "\t\t{" << guid << "}." << i << ".Build.0 = " << dstConfig << "|" fout << "\t\t{" << guid << "}." << i << ".Build.0 = " << dstConfig << "|"
<< platformName << std::endl; << platformName << std::endl;
} }
} }
} }
// output standard header for dsw file
void cmGlobalVisualStudio71Generator::WriteSLNHeader(std::ostream& fout)
{
fout << "Microsoft Visual Studio Solution File, Format Version 8.00\n";
}
 End of changes. 5 change blocks. 
6 lines changed or deleted 7 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)