VS: Add support for Windows 10 Universal (Store) Applications
Teach the VS 2015 generator to support WindowsStore 10.0 applications. Add target properties to customize them: * VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION: Specifies the minimum version of the OS that the project can target. * VS_DESKTOP_EXTENSIONS_VERSION, VS_MOBILE_EXTENSIONS_VERSIONS, VS_IOT_EXTENSIONS_VERSION: Add a reference to the version of the SDK specified to the target allowing to target the extended functionality in a universal project. * VS_IOT_STARTUP_TASK: Specifies that the target should be built as an IOT continuous background task.
This commit is contained in:
parent
2798dbdacb
commit
1be2f12cf2
|
@ -254,17 +254,22 @@ Properties on Targets
|
|||
/prop_tgt/TYPE
|
||||
/prop_tgt/VERSION
|
||||
/prop_tgt/VISIBILITY_INLINES_HIDDEN
|
||||
/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION
|
||||
/prop_tgt/VS_DOTNET_REFERENCES
|
||||
/prop_tgt/VS_DOTNET_TARGET_FRAMEWORK_VERSION
|
||||
/prop_tgt/VS_GLOBAL_KEYWORD
|
||||
/prop_tgt/VS_GLOBAL_PROJECT_TYPES
|
||||
/prop_tgt/VS_GLOBAL_ROOTNAMESPACE
|
||||
/prop_tgt/VS_GLOBAL_variable
|
||||
/prop_tgt/VS_IOT_EXTENSIONS_VERSION
|
||||
/prop_tgt/VS_IOT_STARTUP_TASK
|
||||
/prop_tgt/VS_KEYWORD
|
||||
/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION
|
||||
/prop_tgt/VS_SCC_AUXPATH
|
||||
/prop_tgt/VS_SCC_LOCALPATH
|
||||
/prop_tgt/VS_SCC_PROJECTNAME
|
||||
/prop_tgt/VS_SCC_PROVIDER
|
||||
/prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION
|
||||
/prop_tgt/VS_WINRT_COMPONENT
|
||||
/prop_tgt/VS_WINRT_EXTENSIONS
|
||||
/prop_tgt/VS_WINRT_REFERENCES
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
VS_DESKTOP_EXTENSIONS_VERSION
|
||||
-----------------------------
|
||||
|
||||
Visual Studio Windows 10 Desktop Extensions Version
|
||||
|
||||
Specifies the version of the Desktop Extensions that should be included in the
|
||||
target. For example ``10.0.10240.0``. If the value is not specified, the Desktop
|
||||
Extensions will not be included. To use the same version of the extensions as
|
||||
the Windows 10 SDK that is being used, you can use the
|
||||
:variable:`CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION` variable.
|
|
@ -0,0 +1,10 @@
|
|||
VS_IOT_EXTENSIONS_VERSION
|
||||
-------------------------
|
||||
|
||||
Visual Studio Windows 10 IoT Extensions Version
|
||||
|
||||
Specifies the version of the IoT Extensions that should be included in the
|
||||
target. For example ``10.0.10240.0``. If the value is not specified, the IoT
|
||||
Extensions will not be included. To use the same version of the extensions as
|
||||
the Windows 10 SDK that is being used, you can use the
|
||||
:variable:`CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION` variable.
|
|
@ -0,0 +1,6 @@
|
|||
VS_IOT_STARTUP_TASK
|
||||
-------------------
|
||||
|
||||
Visual Studio Windows 10 IoT Continuous Background Task
|
||||
|
||||
Specifies that the target should be compiled as a Continuous Background Task library.
|
|
@ -0,0 +1,10 @@
|
|||
VS_MOBILE_EXTENSIONS_VERSION
|
||||
----------------------------
|
||||
|
||||
Visual Studio Windows 10 Mobile Extensions Version
|
||||
|
||||
Specifies the version of the Mobile Extensions that should be included in the
|
||||
target. For example ``10.0.10240.0``. If the value is not specified, the Mobile
|
||||
Extensions will not be included. To use the same version of the extensions as
|
||||
the Windows 10 SDK that is being used, you can use the
|
||||
:variable:`CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION` variable.
|
|
@ -0,0 +1,10 @@
|
|||
VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION
|
||||
--------------------------------------
|
||||
|
||||
Visual Studio Windows Target Platform Minimum Version
|
||||
|
||||
For Windows 10. Specifies the minimum version of the OS that is being
|
||||
targeted. For example ``10.0.10240.0``. If the value is not specified, the
|
||||
value of :variable:`CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION` will be used on
|
||||
WindowsStore projects otherwise the target platform minimum version will not
|
||||
be specified for the project.
|
|
@ -463,6 +463,7 @@ void cmVisualStudio10TargetGenerator::Generate()
|
|||
this->WriteString("<Import Project=\"" VS10_USER_PROPS "\""
|
||||
" Condition=\"exists('" VS10_USER_PROPS "')\""
|
||||
" Label=\"LocalAppDataPlatform\" />\n", 2);
|
||||
this->WritePlatformExtensions();
|
||||
this->WriteString("</ImportGroup>\n", 1);
|
||||
this->WriteString("<PropertyGroup Label=\"UserMacros\" />\n", 1);
|
||||
this->WriteWinRTPackageCertificateKeyFile();
|
||||
|
@ -475,6 +476,7 @@ void cmVisualStudio10TargetGenerator::Generate()
|
|||
this->WriteXamlFilesGroup();
|
||||
this->WriteWinRTReferences();
|
||||
this->WriteProjectReferences();
|
||||
this->WriteSDKReferences();
|
||||
this->WriteString(
|
||||
"<Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.targets\""
|
||||
" />\n", 1);
|
||||
|
@ -1307,6 +1309,7 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
|
|||
{
|
||||
tool = "XML";
|
||||
}
|
||||
|
||||
if(this->NsightTegra)
|
||||
{
|
||||
// Nsight Tegra needs specific file types to check up-to-dateness.
|
||||
|
@ -2590,7 +2593,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
|
|||
|
||||
// A Windows Runtime component uses internal .NET metadata,
|
||||
// so does not have an import library.
|
||||
if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT"))
|
||||
if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") &&
|
||||
this->Target->GetType() != cmTarget::EXECUTABLE)
|
||||
{
|
||||
linkOptions.AddFlag("GenerateWindowsMetadata", "true");
|
||||
}
|
||||
|
@ -2896,6 +2900,101 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
|
|||
this->WriteString("</ItemGroup>\n", 1);
|
||||
}
|
||||
|
||||
void cmVisualStudio10TargetGenerator::WritePlatformExtensions()
|
||||
{
|
||||
// This only applies to Windows 10 apps
|
||||
if (this->GlobalGenerator->TargetsWindowsStore() &&
|
||||
cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
|
||||
{
|
||||
const char* desktopExtensionsVersion =
|
||||
this->Target->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
|
||||
if (desktopExtensionsVersion)
|
||||
{
|
||||
this->WriteSinglePlatformExtension("WindowsDesktop",
|
||||
desktopExtensionsVersion);
|
||||
}
|
||||
const char* mobileExtensionsVersion =
|
||||
this->Target->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
|
||||
if (mobileExtensionsVersion)
|
||||
{
|
||||
this->WriteSinglePlatformExtension("WindowsMobile",
|
||||
mobileExtensionsVersion);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void cmVisualStudio10TargetGenerator::WriteSinglePlatformExtension(
|
||||
std::string const& extension,
|
||||
std::string const& version
|
||||
)
|
||||
{
|
||||
this->WriteString("<Import Project=", 2);
|
||||
(*this->BuildFileStream)
|
||||
<< "\"$([Microsoft.Build.Utilities.ToolLocationHelper]"
|
||||
<< "::GetPlatformExtensionSDKLocation(`"
|
||||
<< extension <<", Version=" << version
|
||||
<< "`, $(TargetPlatformIdentifier), $(TargetPlatformVersion), null, "
|
||||
<< "$(ExtensionSDKDirectoryRoot), null))"
|
||||
<< "\\DesignTime\\CommonConfiguration\\Neutral\\"
|
||||
<< extension << ".props\" "
|
||||
<< "Condition=\"exists('$("
|
||||
<< "[Microsoft.Build.Utilities.ToolLocationHelper]"
|
||||
<< "::GetPlatformExtensionSDKLocation(`"
|
||||
<< extension << ", Version=" << version
|
||||
<< "`, $(TargetPlatformIdentifier), $(TargetPlatformVersion), null, "
|
||||
<< "$(ExtensionSDKDirectoryRoot), null))"
|
||||
<< "\\DesignTime\\CommonConfiguration\\Neutral\\"
|
||||
<< extension << ".props')\" />\n";
|
||||
}
|
||||
|
||||
void cmVisualStudio10TargetGenerator::WriteSDKReferences()
|
||||
{
|
||||
// This only applies to Windows 10 apps
|
||||
if (this->GlobalGenerator->TargetsWindowsStore() &&
|
||||
cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
|
||||
{
|
||||
const char* desktopExtensionsVersion =
|
||||
this->Target->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
|
||||
const char* mobileExtensionsVersion =
|
||||
this->Target->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
|
||||
const char* iotExtensionsVersion =
|
||||
this->Target->GetProperty("VS_IOT_EXTENSIONS_VERSION");
|
||||
|
||||
if(desktopExtensionsVersion || mobileExtensionsVersion ||
|
||||
iotExtensionsVersion)
|
||||
{
|
||||
this->WriteString("<ItemGroup>\n", 1);
|
||||
if(desktopExtensionsVersion)
|
||||
{
|
||||
this->WriteSingleSDKReference("WindowsDesktop",
|
||||
desktopExtensionsVersion);
|
||||
}
|
||||
if(mobileExtensionsVersion)
|
||||
{
|
||||
this->WriteSingleSDKReference("WindowsMobile",
|
||||
mobileExtensionsVersion);
|
||||
}
|
||||
if(iotExtensionsVersion)
|
||||
{
|
||||
this->WriteSingleSDKReference("WindowsIoT",
|
||||
iotExtensionsVersion);
|
||||
}
|
||||
this->WriteString("</ItemGroup>\n", 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void cmVisualStudio10TargetGenerator::WriteSingleSDKReference(
|
||||
std::string const& extension,
|
||||
std::string const& version
|
||||
)
|
||||
{
|
||||
this->WriteString("<SDKReference Include=\"", 2);
|
||||
(*this->BuildFileStream) << extension
|
||||
<< ", Version=" << version << "\" />\n";
|
||||
}
|
||||
|
||||
|
||||
void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
|
||||
{
|
||||
if((this->GlobalGenerator->TargetsWindowsStore() ||
|
||||
|
@ -3018,13 +3117,27 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
|
|||
(*this->BuildFileStream) << (isWindowsPhone ?
|
||||
"Windows Phone" : "Windows Store")
|
||||
<< "</ApplicationType>\n";
|
||||
this->WriteString("<DefaultLanguage>en-US"
|
||||
"</DefaultLanguage>\n", 2);
|
||||
if (cmHasLiteralPrefix(v, "10.0"))
|
||||
{
|
||||
this->WriteString("<ApplicationTypeRevision>", 2);
|
||||
(*this->BuildFileStream) << cmVS10EscapeXML("10.0")
|
||||
<< "</ApplicationTypeRevision>\n";
|
||||
// Visual Studio 14.0 is necessary for building 10.0 apps
|
||||
this->WriteString("<MinimumVisualStudioVersion>14.0"
|
||||
"</MinimumVisualStudioVersion>\n", 2);
|
||||
|
||||
if(this->Target->GetType() < cmTarget::UTILITY)
|
||||
{
|
||||
isAppContainer = true;
|
||||
}
|
||||
}
|
||||
else if(v == "8.1")
|
||||
{
|
||||
this->WriteString("<ApplicationTypeRevision>", 2);
|
||||
(*this->BuildFileStream) << cmVS10EscapeXML(v)
|
||||
<< "</ApplicationTypeRevision>\n";
|
||||
this->WriteString("<DefaultLanguage>en-US"
|
||||
"</DefaultLanguage>\n", 2);
|
||||
if(v == "8.1")
|
||||
{
|
||||
// Visual Studio 12.0 is necessary for building 8.1 apps
|
||||
this->WriteString("<MinimumVisualStudioVersion>12.0"
|
||||
"</MinimumVisualStudioVersion>\n", 2);
|
||||
|
@ -3036,6 +3149,9 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
|
|||
}
|
||||
else if (v == "8.0")
|
||||
{
|
||||
this->WriteString("<ApplicationTypeRevision>", 2);
|
||||
(*this->BuildFileStream) << cmVS10EscapeXML(v)
|
||||
<< "</ApplicationTypeRevision>\n";
|
||||
// Visual Studio 11.0 is necessary for building 8.0 apps
|
||||
this->WriteString("<MinimumVisualStudioVersion>11.0"
|
||||
"</MinimumVisualStudioVersion>\n", 2);
|
||||
|
@ -3072,6 +3188,30 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
|
|||
(*this->BuildFileStream) << cmVS10EscapeXML(targetPlatformVersion) <<
|
||||
"</WindowsTargetPlatformVersion>\n";
|
||||
}
|
||||
const char* targetPlatformMinVersion =
|
||||
this->Target->GetProperty("VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION");
|
||||
if(targetPlatformMinVersion)
|
||||
{
|
||||
this->WriteString("<WindowsTargetPlatformMinVersion>", 2);
|
||||
(*this->BuildFileStream) << cmVS10EscapeXML(targetPlatformMinVersion) <<
|
||||
"</WindowsTargetPlatformMinVersion>\n";
|
||||
}
|
||||
else if (isWindowsStore && cmHasLiteralPrefix(v, "10.0"))
|
||||
{
|
||||
// If the min version is not set, then use the TargetPlatformVersion
|
||||
if (!targetPlatformVersion.empty())
|
||||
{
|
||||
this->WriteString("<WindowsTargetPlatformMinVersion>", 2);
|
||||
(*this->BuildFileStream) << cmVS10EscapeXML(targetPlatformVersion) <<
|
||||
"</WindowsTargetPlatformMinVersion>\n";
|
||||
}
|
||||
}
|
||||
|
||||
// Added IoT Startup Task support
|
||||
if(this->Target->GetPropertyAsBool("VS_IOT_STARTUP_TASK"))
|
||||
{
|
||||
this->WriteString("<ContainsStartupTask>true</ContainsStartupTask>\n", 2);
|
||||
}
|
||||
}
|
||||
|
||||
void cmVisualStudio10TargetGenerator::VerifyNecessaryFiles()
|
||||
|
@ -3124,7 +3264,7 @@ void cmVisualStudio10TargetGenerator::VerifyNecessaryFiles()
|
|||
{
|
||||
this->IsMissingFiles = true;
|
||||
}
|
||||
else if (v == "8.1")
|
||||
else if (v == "8.1" || cmHasLiteralPrefix(v, "10.0"))
|
||||
{
|
||||
this->IsMissingFiles = true;
|
||||
}
|
||||
|
@ -3158,6 +3298,10 @@ void cmVisualStudio10TargetGenerator::WriteMissingFiles()
|
|||
{
|
||||
this->WriteMissingFilesWS81();
|
||||
}
|
||||
else if (cmHasLiteralPrefix(v, "10.0"))
|
||||
{
|
||||
this->WriteMissingFilesWS10_0();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3419,6 +3563,64 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS81()
|
|||
this->WriteCommonMissingFiles(manifestFile);
|
||||
}
|
||||
|
||||
void cmVisualStudio10TargetGenerator::WriteMissingFilesWS10_0()
|
||||
{
|
||||
std::string manifestFile =
|
||||
this->DefaultArtifactDir + "/package.appxManifest";
|
||||
std::string artifactDir =
|
||||
this->LocalGenerator->GetTargetDirectory(*this->Target);
|
||||
this->ConvertToWindowsSlash(artifactDir);
|
||||
std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
|
||||
std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
|
||||
|
||||
cmGeneratedFileStream fout(manifestFile.c_str());
|
||||
fout.SetCopyIfDifferent(true);
|
||||
|
||||
fout <<
|
||||
"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
|
||||
"<Package\n\t"
|
||||
"xmlns=\"http://schemas.microsoft.com/appx/manifest/foundation/windows10\""
|
||||
"\txmlns:mp=\"http://schemas.microsoft.com/appx/2014/phone/manifest\"\n"
|
||||
"\txmlns:uap=\"http://schemas.microsoft.com/appx/manifest/uap/windows10\""
|
||||
"\n\tIgnorableNamespaces=\"uap mp\">\n\n"
|
||||
"\t<Identity Name=\"" << this->GUID << "\" Publisher=\"CN=CMake\""
|
||||
" Version=\"1.0.0.0\" />\n"
|
||||
"\t<mp:PhoneIdentity PhoneProductId=\"" << this->GUID <<
|
||||
"\" PhonePublisherId=\"00000000-0000-0000-0000-000000000000\"/>\n"
|
||||
"\t<Properties>\n"
|
||||
"\t\t<DisplayName>" << targetNameXML << "</DisplayName>\n"
|
||||
"\t\t<PublisherDisplayName>CMake</PublisherDisplayName>\n"
|
||||
"\t\t<Logo>" << artifactDirXML << "\\StoreLogo.png</Logo>\n"
|
||||
"\t</Properties>\n"
|
||||
"\t<Dependencies>\n"
|
||||
"\t\t<TargetDeviceFamily Name=\"Windows.Universal\" "
|
||||
"MinVersion=\"10.0.0.0\" MaxVersionTested=\"10.0.0.0\" />\n"
|
||||
"\t</Dependencies>\n"
|
||||
|
||||
"\t<Resources>\n"
|
||||
"\t\t<Resource Language=\"x-generate\" />\n"
|
||||
"\t</Resources>\n"
|
||||
"\t<Applications>\n"
|
||||
"\t\t<Application Id=\"App\""
|
||||
" Executable=\"" << targetNameXML << ".exe\""
|
||||
" EntryPoint=\"" << targetNameXML << ".App\">\n"
|
||||
"\t\t\t<uap:VisualElements\n"
|
||||
"\t\t\t\tDisplayName=\"" << targetNameXML << "\"\n"
|
||||
"\t\t\t\tDescription=\"" << targetNameXML << "\"\n"
|
||||
"\t\t\t\tBackgroundColor=\"#336699\"\n"
|
||||
"\t\t\t\tSquare150x150Logo=\"" << artifactDirXML << "\\Logo.png\"\n"
|
||||
"\t\t\t\tSquare44x44Logo=\"" << artifactDirXML <<
|
||||
"\\SmallLogo44x44.png\">\n"
|
||||
"\t\t\t\t<uap:SplashScreen"
|
||||
" Image=\"" << artifactDirXML << "\\SplashScreen.png\" />\n"
|
||||
"\t\t\t</uap:VisualElements>\n"
|
||||
"\t\t</Application>\n"
|
||||
"\t</Applications>\n"
|
||||
"</Package>\n";
|
||||
|
||||
this->WriteCommonMissingFiles(manifestFile);
|
||||
}
|
||||
|
||||
void
|
||||
cmVisualStudio10TargetGenerator
|
||||
::WriteCommonMissingFiles(const std::string& manifestFile)
|
||||
|
@ -3442,6 +3644,14 @@ cmVisualStudio10TargetGenerator
|
|||
(*this->BuildFileStream) << cmVS10EscapeXML(smallLogo) << "\" />\n";
|
||||
this->AddedFiles.push_back(smallLogo);
|
||||
|
||||
std::string smallLogo44 = this->DefaultArtifactDir + "/SmallLogo44x44.png";
|
||||
cmSystemTools::CopyAFile(templateFolder + "/SmallLogo44x44.png",
|
||||
smallLogo44, false);
|
||||
this->ConvertToWindowsSlash(smallLogo44);
|
||||
this->WriteString("<Image Include=\"", 2);
|
||||
(*this->BuildFileStream) << cmVS10EscapeXML(smallLogo44) << "\" />\n";
|
||||
this->AddedFiles.push_back(smallLogo44);
|
||||
|
||||
std::string logo = this->DefaultArtifactDir + "/Logo.png";
|
||||
cmSystemTools::CopyAFile(templateFolder + "/Logo.png",
|
||||
logo, false);
|
||||
|
|
|
@ -78,6 +78,13 @@ private:
|
|||
void WriteMissingFilesWP81();
|
||||
void WriteMissingFilesWS80();
|
||||
void WriteMissingFilesWS81();
|
||||
void WriteMissingFilesWS10_0();
|
||||
void WritePlatformExtensions();
|
||||
void WriteSinglePlatformExtension(std::string const& extension,
|
||||
std::string const& version);
|
||||
void WriteSDKReferences();
|
||||
void WriteSingleSDKReference(std::string const& extension,
|
||||
std::string const& version);
|
||||
void WriteCommonMissingFiles(const std::string& manifestFile);
|
||||
void WriteTargetSpecificReferences();
|
||||
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 554 B |
|
@ -1955,13 +1955,15 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
|
|||
set(reg_vs10 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0;InstallDir]")
|
||||
set(reg_vs11 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0;InstallDir]")
|
||||
set(reg_vs12 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0;InstallDir]")
|
||||
set(reg_vs14 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots;KitsRoot10]")
|
||||
set(reg_ws80 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.0;InstallationFolder]")
|
||||
set(reg_ws81 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.1;InstallationFolder]")
|
||||
set(reg_ws10_0 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\Setup\\Build Tools for Windows 10;srcPath]")
|
||||
set(reg_wp80 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\WindowsPhone\\v8.0;InstallationFolder]")
|
||||
set(reg_wp81 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\WindowsPhone\\v8.1;InstallationFolder]")
|
||||
select_wince_sdk(reg_wince wince_sdk)
|
||||
set(reg_tegra "[HKEY_LOCAL_MACHINE\\SOFTWARE\\NVIDIA Corporation\\Nsight Tegra;sdkRoot]")
|
||||
foreach(reg vs10 vs11 vs12 ws80 ws81 wp80 wp81 wince tegra)
|
||||
foreach(reg vs10 vs11 vs12 vs14 ws80 ws81 ws10_0 wp80 wp81 wince tegra)
|
||||
get_filename_component(r "${reg_${reg}}" ABSOLUTE)
|
||||
if(IS_DIRECTORY "${r}")
|
||||
set(${reg} 1)
|
||||
|
@ -2008,6 +2010,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
|
|||
-DCMAKE_SYSTEM_VERSION=8.1
|
||||
)
|
||||
endif()
|
||||
if(vs14 AND ws10_0)
|
||||
add_test_VSWinStorePhone(vs14-store10_0-X86 "Visual Studio 14 2015" WindowsStore 10.0)
|
||||
add_test_VSWinStorePhone(vs14-store10_0-ARM "Visual Studio 14 2015 ARM" WindowsStore 10.0)
|
||||
add_test_VSWinStorePhone(vs14-store10_0-X64 "Visual Studio 14 2015 Win64" WindowsStore 10.0)
|
||||
endif()
|
||||
if(vs11 AND wp80)
|
||||
add_test_VSWinStorePhone(vs11-phone80-X86 "Visual Studio 11 2012" WindowsPhone 8.0)
|
||||
add_test_VSWinStorePhone(vs11-phone80-ARM "Visual Studio 11 2012 ARM" WindowsPhone 8.0)
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
cmake_minimum_required(VERSION 3.0)
|
||||
project(VSWinStorePhone)
|
||||
|
||||
if(MSVC_VERSION GREATER 1700)
|
||||
if(MSVC_VERSION GREATER 1899)
|
||||
set(COMPILER_VERSION "14")
|
||||
elseif(MSVC_VERSION GREATER 1700)
|
||||
set(COMPILER_VERSION "12")
|
||||
elseif(MSVC_VERSION GREATER 1600)
|
||||
set(COMPILER_VERSION "11")
|
||||
|
@ -91,6 +92,7 @@ elseif (NOT "${PLATFORM}" STREQUAL "DESKTOP")
|
|||
set(ASSET_FILES ${ASSET_FILES}
|
||||
Direct3DApp1/Assets/Logo.png
|
||||
Direct3DApp1/Assets/SmallLogo.png
|
||||
Direct3DApp1/Assets/SmallLogo44x44.png
|
||||
Direct3DApp1/Assets/SplashScreen.png
|
||||
Direct3DApp1/Assets/StoreLogo.png
|
||||
)
|
||||
|
@ -124,4 +126,15 @@ source_group("Resource Files" FILES ${RESOURCE_FILES})
|
|||
|
||||
add_executable(${EXE_NAME} WIN32 ${SOURCE_FILES} ${HEADER_FILES} ${RESOURCE_FILES})
|
||||
set_property(TARGET ${EXE_NAME} PROPERTY VS_WINRT_COMPONENT TRUE)
|
||||
|
||||
string(SUBSTRING "${CMAKE_SYSTEM_VERSION}" 0, 4, SHORT_VERSION)
|
||||
|
||||
if("${SHORT_VERSION}" STREQUAL "10.0")
|
||||
message(STATUS "Targeting Windows 10. Setting Extensions to version ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
|
||||
set_property(TARGET ${EXE_NAME} PROPERTY VS_DESKTOP_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
|
||||
set_property(TARGET ${EXE_NAME} PROPERTY VS_MOBILE_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
|
||||
set_property(TARGET ${EXE_NAME} PROPERTY VS_IOT_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
|
||||
endif()
|
||||
|
||||
|
||||
target_link_libraries(${EXE_NAME} d3d11)
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 554 B |
|
@ -0,0 +1,36 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Package
|
||||
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
|
||||
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
|
||||
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
|
||||
IgnorableNamespaces="uap mp">
|
||||
|
||||
<Identity Name="@PACKAGE_GUID@" Publisher="CN=mgong" Version="1.1.0.0" />
|
||||
<mp:PhoneIdentity PhoneProductId="@PACKAGE_GUID@" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
|
||||
|
||||
<Properties>
|
||||
<DisplayName>@SHORT_NAME@</DisplayName>
|
||||
<PublisherDisplayName>mgong</PublisherDisplayName>
|
||||
<Logo>Assets/StoreLogo.png</Logo>
|
||||
</Properties>
|
||||
|
||||
<Dependencies>
|
||||
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.65535.65535" />
|
||||
</Dependencies>
|
||||
|
||||
<Resources>
|
||||
<Resource Language="x-generate" />
|
||||
</Resources>
|
||||
<Applications>
|
||||
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="@SHORT_NAME@.App">
|
||||
<uap:VisualElements
|
||||
DisplayName="@SHORT_NAME@"
|
||||
Description="@SHORT_NAME@"
|
||||
BackgroundColor="#336699"
|
||||
Square150x150Logo="Assets/Logo.png"
|
||||
Square44x44Logo="Assets/SmallLogo44x44.png">
|
||||
<uap:SplashScreen Image="Assets/SplashScreen.png" />
|
||||
</uap:VisualElements>
|
||||
</Application>
|
||||
</Applications>
|
||||
</Package>
|
Loading…
Reference in New Issue