diff options
| author | Gaurav Khanna <gkhanna@microsoft.com> | 2016-10-14 17:03:00 -0700 |
|---|---|---|
| committer | Gaurav Khanna <gkhanna@microsoft.com> | 2016-10-14 17:03:00 -0700 |
| commit | cb608b92605772afea32831c9b8186ab0f2203af (patch) | |
| tree | 995e53b104fdd97e9eab4a8fded6e56ff3b412ce | |
| parent | 37606601b6293e9c46f4d7cc614b9304fed7647b (diff) | |
| download | coreclr-cb608b92605772afea32831c9b8186ab0f2203af.tar.gz coreclr-cb608b92605772afea32831c9b8186ab0f2203af.tar.bz2 coreclr-cb608b92605772afea32831c9b8186ab0f2203af.zip | |
Explicitly specify the Windows SDK version for CMake.
| -rw-r--r-- | build.cmd | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -222,7 +222,13 @@ if %__BuildNative% EQU 1 ( :: Set the environment for the native build set __VCBuildArch=x86_amd64 if /i "%__BuildArch%" == "x86" ( set __VCBuildArch=x86 ) - if /i "%__BuildArch%" == "arm" (set __VCBuildArch=x86_arm) + if /i "%__BuildArch%" == "arm" ( + set __VCBuildArch=x86_arm + + REM Make CMake pick the highest installed version in the 10.0.* range + set __ExtraCmakeArgs="-DCMAKE_SYSTEM_VERSION=10.0" + ) + echo %__MsgPrefix%Using environment: "%__VSToolsRoot%\..\..\VC\vcvarsall.bat" !__VCBuildArch! call "%__VSToolsRoot%\..\..\VC\vcvarsall.bat" !__VCBuildArch! @if defined _echo @echo on @@ -232,13 +238,14 @@ if %__BuildNative% EQU 1 ( exit /b 1 ) if not exist "!VSINSTALLDIR!DIA SDK" goto NoDIA + :GenVSSolution if defined __SkipConfigure goto SkipConfigure echo %__MsgPrefix%Regenerating the Visual Studio solution pushd "%__IntermediatesDir%" - set __ExtraCmakeArgs="-DCLR_CMAKE_TARGET_OS=%__BuildOs%" "-DCLR_CMAKE_PACKAGES_DIR=%__PackagesDir%" "-DCLR_CMAKE_PGO_INSTRUMENT=%__PgoInstrument%" + set __ExtraCmakeArgs=%__ExtraCmakeArgs% "-DCLR_CMAKE_TARGET_OS=%__BuildOs%" "-DCLR_CMAKE_PACKAGES_DIR=%__PackagesDir%" "-DCLR_CMAKE_PGO_INSTRUMENT=%__PgoInstrument%" call "%__SourceDir%\pal\tools\gen-buildsys-win.bat" "%__ProjectDir%" %__VSVersion% %__BuildArch% %__BuildJit32% !__ExtraCmakeArgs! @if defined _echo @echo on popd |