mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Projucer: Use a workaround to set the VS2017 Windows target platform option to the latest Windows 10 SDK installed on the build machine by default

Browse source
This commit is contained in:
ed 2018-09-07 14:31:55 +01:00
parent 773ca9a3b3
commit bb0a0d3cb6
1 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

25
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_MSVC.h
View file

@ -77,8 +77,8 @@ public:
props.add (new TextPropertyComponent (targetPlatformVersion, "Windows Target Platform", 20, false),
String ("Specifies the version of the Windows SDK that will be used when building this project. ")
+ (isWindows10SDK ? "You can see which SDKs you have installed on your machine by going to \"Program Files (x86)\\Windows Kits\\10\\Lib\". " : "")
+ "The default value for this exporter is " + getDefaultWindowsTargetPlatformVersion());
+ (isWindows10SDK ? "Leave this field empty to use the latest Windows 10 SDK installed on the build machine."
: "The default value for this exporter is " + getDefaultWindowsTargetPlatformVersion()));
}
void addPlatformToolsetToPropertyGroup (XmlElement& p) const
@ -89,8 +89,23 @@ public:
void addWindowsTargetPlatformVersionToPropertyGroup (XmlElement& p) const
{
forEachXmlChildElementWithTagName (p, e, "PropertyGroup")
e->createNewChildElement ("WindowsTargetPlatformVersion")->addTextElement (getWindowsTargetPlatformVersion());
auto target = getWindowsTargetPlatformVersion();
if (target == "Latest")
{
forEachXmlChildElementWithTagName (p, e, "PropertyGroup")
{
auto* child = e->createNewChildElement ("WindowsTargetPlatformVersion");
child->setAttribute ("Condition", "'$(WindowsTargetPlatformVersion)' == ''");
child->addTextElement ("$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))");
}
}
else
{
forEachXmlChildElementWithTagName (p, e, "PropertyGroup")
e->createNewChildElement ("WindowsTargetPlatformVersion")->addTextElement (target);
}
}
void addIPPSettingToPropertyGroup (XmlElement& p) const
@ -1944,7 +1959,7 @@ public:
String getSolutionComment() const override { return "# Visual Studio 2017"; }
String getToolsVersion() const override { return "15.0"; }
String getDefaultToolset() const override { return "v141"; }
String getDefaultWindowsTargetPlatformVersion() const override { return "10.0.16299.0"; }
String getDefaultWindowsTargetPlatformVersion() const override { return "Latest"; }
static MSVCProjectExporterVC2017* createForSettings (Project& project, const ValueTree& settings)
{