mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-29 10:39:28 -05:00
Merge topic 'vs-project-import'
d145d72e70 VS: add target property VS_PROJECT_IMPORT_<propspath>
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3143
This commit is contained in:
@@ -663,6 +663,7 @@ void cmVisualStudio10TargetGenerator::Generate()
|
||||
this->WriteCustomCommands(e0);
|
||||
this->WriteAllSources(e0);
|
||||
this->WriteDotNetReferences(e0);
|
||||
this->WriteImports(e0);
|
||||
this->WriteEmbeddedResourceGroup(e0);
|
||||
this->WriteXamlFilesGroup(e0);
|
||||
this->WriteWinRTReferences(e0);
|
||||
@@ -811,6 +812,24 @@ void cmVisualStudio10TargetGenerator::WriteDotNetReference(
|
||||
this->WriteDotNetReferenceCustomTags(e2, ref);
|
||||
}
|
||||
|
||||
void cmVisualStudio10TargetGenerator::WriteImports(Elem& e0)
|
||||
{
|
||||
const char* imports =
|
||||
this->GeneratorTarget->Target->GetProperty("VS_PROJECT_IMPORT");
|
||||
if (imports) {
|
||||
std::vector<std::string> argsSplit;
|
||||
cmSystemTools::ExpandListArgument(std::string(imports), argsSplit, false);
|
||||
for (auto& path : argsSplit) {
|
||||
if (!cmsys::SystemTools::FileIsFullPath(path)) {
|
||||
path = this->Makefile->GetCurrentSourceDirectory() + "/" + path;
|
||||
}
|
||||
ConvertToWindowsSlash(path);
|
||||
Elem e1(e0, "Import");
|
||||
e1.Attribute("Project", path);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void cmVisualStudio10TargetGenerator::WriteDotNetReferenceCustomTags(
|
||||
Elem& e2, std::string const& ref)
|
||||
{
|
||||
|
||||
@@ -76,6 +76,7 @@ private:
|
||||
void WriteDotNetReference(Elem& e1, std::string const& ref,
|
||||
std::string const& hint,
|
||||
std::string const& config);
|
||||
void WriteImports(Elem& e0);
|
||||
void WriteDotNetReferenceCustomTags(Elem& e2, std::string const& ref);
|
||||
void WriteEmbeddedResourceGroup(Elem& e0);
|
||||
void WriteWinRTReferences(Elem& e0);
|
||||
|
||||
Reference in New Issue
Block a user