summaryrefslogtreecommitdiff
path: root/build.cmd
diff options
context:
space:
mode:
authorKasper F. Brandt <poizan@poizan.dk>2015-02-07 19:26:24 +0100
committerKasper F. Brandt <poizan@poizan.dk>2015-02-12 18:19:00 +0100
commit63840719322b236420f6bd2fd53dbb8a5e4e908d (patch)
tree2e755daee17e7a1a690110b27a37425063e20934 /build.cmd
parent5baf48df8e2a6d9b1fce906ae2248db81ec61a01 (diff)
downloadcoreclr-63840719322b236420f6bd2fd53dbb8a5e4e908d.tar.gz
coreclr-63840719322b236420f6bd2fd53dbb8a5e4e908d.tar.bz2
coreclr-63840719322b236420f6bd2fd53dbb8a5e4e908d.zip
Make build.cmd lookup the install directory of cmake in the registry if it's not on the path.
Diffstat (limited to 'build.cmd')
-rw-r--r--build.cmd12
1 files changed, 5 insertions, 7 deletions
diff --git a/build.cmd b/build.cmd
index bbcefc6132..5e84112e44 100644
--- a/build.cmd
+++ b/build.cmd
@@ -74,16 +74,14 @@ md "%__LogsDir%"
::Cleanup intermediates folder
if exist "%__IntermediatesDir%" rd /s /q "%__IntermediatesDir%"
-:: Check prerequisites
:CheckPrereqs
+:: Check prerequisites
echo Checking pre-requisites...
echo.
-::
-:: Check presence of CMake on the path
-for %%X in (cmake.exe) do (set FOUNDCMake=%%~$PATH:X)
-if defined FOUNDCMake goto CheckVS
-echo CMake is a pre-requisite to build this repository but it was not found on the path. Please install CMake from http://www.cmake.org/download/ and ensure it is on your path.
-goto :eof
+:: Eval the output from probe-win1.ps1
+for /f "delims=" %%a in ('powershell -NoProfile -ExecutionPolicy RemoteSigned "& ""%__SourceDir%\pal\tools\probe-win.ps1"""') do %%a
+
+goto CheckVS
:CheckVS
:: Check presence of VS