Skip to content

Commit

Permalink
Re #8882. Put the whole generator string in one place.
Browse files Browse the repository at this point in the history
  • Loading branch information
RussellTaylor committed Feb 28, 2014
1 parent d81e546 commit 73bdfc4
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Code/Mantid/Build/Jenkins/buildscript.bat
Expand Up @@ -12,9 +12,10 @@
:: Test what architecture we are building for
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
if "%NODE_LABELS%"=="%NODE_LABELS:win32=%" (
set GENERATOR=" Win64"
set GENERATOR="Visual Studio 11 Win64"
) ELSE (
set WIN32=win32
set GENERATOR="Visual Studio 11"
)

:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
Expand All @@ -35,7 +36,7 @@ cd %WORKSPACE%\build
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: CMake configuration
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
"C:\Program Files (x86)\CMake 2.8\bin\cmake.exe" -G "Visual Studio 11"%GENERATOR% -D CONSOLE=OFF -D ENABLE_CPACK=ON -D USE_PRECOMPILED_HEADERS=ON ..\Code\Mantid
"C:\Program Files (x86)\CMake 2.8\bin\cmake.exe" -G %GENERATOR% -D CONSOLE=OFF -D ENABLE_CPACK=ON -D USE_PRECOMPILED_HEADERS=ON ..\Code\Mantid

:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: Build step
Expand Down

0 comments on commit 73bdfc4

Please sign in to comment.