dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-04 14:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

VS: Pass whole target to WriteProjectConfigurations

Browse Source
This commit is contained in:
Beeble
2017-04-04 21:12:26 +02:00
committed by Brad King
parent 4b9e15fb47
commit 4cd815f0b3
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGlobalVisualStudio71Generator.cxx
View File

@@ -249,7 +249,7 @@ void cmGlobalVisualStudio71Generator::WriteExternalProject(
// 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::WriteProjectConfigurations( void cmGlobalVisualStudio71Generator::WriteProjectConfigurations(
std::ostream& fout, const std::string& name, cmStateEnums::TargetType, std::ostream& fout, const std::string& name, cmGeneratorTarget const& target,
std::vector<std::string> const& configs, std::vector<std::string> const& configs,
const std::set<std::string>& configsPartOfDefaultBuild, const std::set<std::string>& configsPartOfDefaultBuild,
std::string const& platformMapping) std::string const& platformMapping)

4
Source/cmGlobalVisualStudio71Generator.h
View File

@@ -56,8 +56,8 @@ protected:
const char* path, const char* path,
cmGeneratorTarget const* t); cmGeneratorTarget const* t);
virtual void WriteProjectConfigurations( virtual void WriteProjectConfigurations(
std::ostream& fout, const std::string& name, cmStateEnums::TargetType type, std::ostream& fout, const std::string& name,
std::vector<std::string> const& configs, cmGeneratorTarget const& target, std::vector<std::string> const& configs,
const std::set<std::string>& configsPartOfDefaultBuild, const std::set<std::string>& configsPartOfDefaultBuild,
const std::string& platformMapping = ""); const std::string& platformMapping = "");
virtual void WriteExternalProject(std::ostream& fout, virtual void WriteExternalProject(std::ostream& fout,

10
Source/cmGlobalVisualStudio7Generator.cxx
View File

@@ -356,16 +356,16 @@ void cmGlobalVisualStudio7Generator::WriteTargetConfigurations(
if (expath) { if (expath) {
std::set<std::string> allConfigurations(configs.begin(), configs.end()); std::set<std::string> allConfigurations(configs.begin(), configs.end());
const char* mapping = target->GetProperty("VS_PLATFORM_MAPPING"); const char* mapping = target->GetProperty("VS_PLATFORM_MAPPING");
this->WriteProjectConfigurations( this->WriteProjectConfigurations(fout, target->GetName().c_str(),
fout, target->GetName().c_str(), target->GetType(), configs, *target, configs, allConfigurations,
allConfigurations, mapping ? mapping : ""); mapping ? mapping : "");
} else { } else {
const std::set<std::string>& configsPartOfDefaultBuild = const std::set<std::string>& configsPartOfDefaultBuild =
this->IsPartOfDefaultBuild(configs, projectTargets, target); this->IsPartOfDefaultBuild(configs, projectTargets, target);
const char* vcprojName = target->GetProperty("GENERATOR_FILE_NAME"); const char* vcprojName = target->GetProperty("GENERATOR_FILE_NAME");
if (vcprojName) { if (vcprojName) {
this->WriteProjectConfigurations(fout, vcprojName, target->GetType(), this->WriteProjectConfigurations(fout, vcprojName, *target, configs,
configs, configsPartOfDefaultBuild); configsPartOfDefaultBuild);
} }
} }
} }

4
Source/cmGlobalVisualStudio7Generator.h
View File

@@ -121,8 +121,8 @@ protected:
const char* path, const char* path,
cmGeneratorTarget const* t) = 0; cmGeneratorTarget const* t) = 0;
virtual void WriteProjectConfigurations( virtual void WriteProjectConfigurations(
std::ostream& fout, const std::string& name, cmStateEnums::TargetType type, std::ostream& fout, const std::string& name,
std::vector<std::string> const& configs, cmGeneratorTarget const& target, std::vector<std::string> const& configs,
const std::set<std::string>& configsPartOfDefaultBuild, const std::set<std::string>& configsPartOfDefaultBuild,
const std::string& platformMapping = "") = 0; const std::string& platformMapping = "") = 0;
virtual void WriteSLNGlobalSections(std::ostream& fout, virtual void WriteSLNGlobalSections(std::ostream& fout,

4
Source/cmGlobalVisualStudio8Generator.cxx
View File

@@ -353,7 +353,7 @@ void cmGlobalVisualStudio8Generator::WriteSolutionConfigurations(
} }
void cmGlobalVisualStudio8Generator::WriteProjectConfigurations( void cmGlobalVisualStudio8Generator::WriteProjectConfigurations(
std::ostream& fout, const std::string& name, cmStateEnums::TargetType type, std::ostream& fout, const std::string& name, cmGeneratorTarget const& target,
std::vector<std::string> const& configs, std::vector<std::string> const& configs,
const std::set<std::string>& configsPartOfDefaultBuild, const std::set<std::string>& configsPartOfDefaultBuild,
std::string const& platformMapping) std::string const& platformMapping)
@@ -375,7 +375,7 @@ void cmGlobalVisualStudio8Generator::WriteProjectConfigurations(
: this->GetPlatformName()) : this->GetPlatformName())
<< "\n"; << "\n";
} }
if (this->NeedsDeploy(type)) { if (this->NeedsDeploy(target.GetType())) {
fout << "\t\t{" << guid << "}." << *i << "|" << this->GetPlatformName() fout << "\t\t{" << guid << "}." << *i << "|" << this->GetPlatformName()
<< ".Deploy.0 = " << *i << "|" << ".Deploy.0 = " << *i << "|"
<< (!platformMapping.empty() ? platformMapping << (!platformMapping.empty() ? platformMapping

4
Source/cmGlobalVisualStudio8Generator.h
View File

@@ -82,8 +82,8 @@ protected:
virtual void WriteSolutionConfigurations( virtual void WriteSolutionConfigurations(
std::ostream& fout, std::vector<std::string> const& configs); std::ostream& fout, std::vector<std::string> const& configs);
virtual void WriteProjectConfigurations( virtual void WriteProjectConfigurations(
std::ostream& fout, const std::string& name, cmStateEnums::TargetType type, std::ostream& fout, const std::string& name,
std::vector<std::string> const& configs, cmGeneratorTarget const& target, std::vector<std::string> const& configs,
const std::set<std::string>& configsPartOfDefaultBuild, const std::set<std::string>& configsPartOfDefaultBuild,
const std::string& platformMapping = ""); const std::string& platformMapping = "");
virtual bool ComputeTargetDepends(); virtual bool ComputeTargetDepends();