kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VS: Added "Deploy" at project configuration for WindowsCE targets

This commit is contained in:
Patrick Gansterer 2012-09-14 12:06:57 +02:00 committed by Brad King
parent 40c36c9f7b
commit 3a1006e41f
6 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGlobalVisualStudio71Generator.cxx
View File

@ -277,7 +277,7 @@ void cmGlobalVisualStudio71Generator
// executables to the libraries it uses are also done here // executables to the libraries it uses are also done here
void cmGlobalVisualStudio71Generator void cmGlobalVisualStudio71Generator
::WriteProjectConfigurations( ::WriteProjectConfigurations(
std::ostream& fout, const char* name, std::ostream& fout, const char* name, cmTarget::TargetType,
const std::set<std::string>& configsPartOfDefaultBuild, const std::set<std::string>& configsPartOfDefaultBuild,
const char* platformMapping) const char* platformMapping)
{ {

2
Source/cmGlobalVisualStudio71Generator.h
View File

@ -63,7 +63,7 @@ protected:
virtual void WriteProjectDepends(std::ostream& fout, virtual void WriteProjectDepends(std::ostream& fout,
const char* name, const char* path, cmTarget &t); const char* name, const char* path, cmTarget &t);
virtual void WriteProjectConfigurations( virtual void WriteProjectConfigurations(
std::ostream& fout, const char* name, std::ostream& fout, const char* name, cmTarget::TargetType type,
const std::set<std::string>& configsPartOfDefaultBuild, const std::set<std::string>& configsPartOfDefaultBuild,
const char* platformMapping = NULL); const char* platformMapping = NULL);
virtual void WriteExternalProject(std::ostream& fout, virtual void WriteExternalProject(std::ostream& fout,

6
Source/cmGlobalVisualStudio7Generator.cxx
View File

@ -247,7 +247,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetConfigurations(
std::set<std::string> allConfigurations(this->Configurations.begin(), std::set<std::string> allConfigurations(this->Configurations.begin(),
this->Configurations.end()); this->Configurations.end());
this->WriteProjectConfigurations( this->WriteProjectConfigurations(
fout, target->GetName(), fout, target->GetName(), target->GetType(),
allConfigurations, target->GetProperty("VS_PLATFORM_MAPPING")); allConfigurations, target->GetProperty("VS_PLATFORM_MAPPING"));
} }
else else
@ -259,7 +259,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetConfigurations(
target->GetProperty("GENERATOR_FILE_NAME"); target->GetProperty("GENERATOR_FILE_NAME");
if (vcprojName) if (vcprojName)
{ {
this->WriteProjectConfigurations(fout, vcprojName, this->WriteProjectConfigurations(fout, vcprojName, target->GetType(),
configsPartOfDefaultBuild); configsPartOfDefaultBuild);
} }
} }
@ -587,7 +587,7 @@ cmGlobalVisualStudio7Generator
// executables to the libraries it uses are also done here // executables to the libraries it uses are also done here
void cmGlobalVisualStudio7Generator void cmGlobalVisualStudio7Generator
::WriteProjectConfigurations( ::WriteProjectConfigurations(
std::ostream& fout, const char* name, std::ostream& fout, const char* name, cmTarget::TargetType,
const std::set<std::string>& configsPartOfDefaultBuild, const std::set<std::string>& configsPartOfDefaultBuild,
const char* platformMapping) const char* platformMapping)
{ {

2
Source/cmGlobalVisualStudio7Generator.h
View File

@ -108,7 +108,7 @@ protected:
virtual void WriteProjectDepends(std::ostream& fout, virtual void WriteProjectDepends(std::ostream& fout,
const char* name, const char* path, cmTarget &t); const char* name, const char* path, cmTarget &t);
virtual void WriteProjectConfigurations( virtual void WriteProjectConfigurations(
std::ostream& fout, const char* name, std::ostream& fout, const char* name, cmTarget::TargetType type,
const std::set<std::string>& configsPartOfDefaultBuild, const std::set<std::string>& configsPartOfDefaultBuild,
const char* platformMapping = NULL); const char* platformMapping = NULL);
virtual void WriteSLNGlobalSections(std::ostream& fout, virtual void WriteSLNGlobalSections(std::ostream& fout,

11
Source/cmGlobalVisualStudio8Generator.cxx
View File

@ -374,7 +374,7 @@ cmGlobalVisualStudio8Generator
void void
cmGlobalVisualStudio8Generator cmGlobalVisualStudio8Generator
::WriteProjectConfigurations( ::WriteProjectConfigurations(
std::ostream& fout, const char* name, std::ostream& fout, const char* name, cmTarget::TargetType type,
const std::set<std::string>& configsPartOfDefaultBuild, const std::set<std::string>& configsPartOfDefaultBuild,
const char* platformMapping) const char* platformMapping)
{ {
@ -395,6 +395,15 @@ cmGlobalVisualStudio8Generator
<< (platformMapping ? platformMapping : this->GetPlatformName()) << (platformMapping ? platformMapping : this->GetPlatformName())
<< "\n"; << "\n";
} }
bool needsDeploy = (type == cmTarget::EXECUTABLE ||
type == cmTarget::SHARED_LIBRARY);
if(this->TargetsWindowsCE() && needsDeploy)
{
fout << "\t\t{" << guid << "}." << *i
<< "|" << this->GetPlatformName() << ".Deploy.0 = " << *i << "|"
<< (platformMapping ? platformMapping : this->GetPlatformName())
<< "\n";
}
} }
} }

2
Source/cmGlobalVisualStudio8Generator.h
View File

@ -79,7 +79,7 @@ protected:
virtual void WriteSLNHeader(std::ostream& fout); virtual void WriteSLNHeader(std::ostream& fout);
virtual void WriteSolutionConfigurations(std::ostream& fout); virtual void WriteSolutionConfigurations(std::ostream& fout);
virtual void WriteProjectConfigurations( virtual void WriteProjectConfigurations(
std::ostream& fout, const char* name, std::ostream& fout, const char* name, cmTarget::TargetType type,
const std::set<std::string>& configsPartOfDefaultBuild, const std::set<std::string>& configsPartOfDefaultBuild,
const char* platformMapping = NULL); const char* platformMapping = NULL);
virtual bool ComputeTargetDepends(); virtual bool ComputeTargetDepends();