# HG changeset patch # User Gareth Stockwell # Date 1285326176 -3600 # Node ID 1a4430846fcf2528c775e90eca1ca35bbb77ba4a # Parent 563aa0c4cea3fc395c24ba6b25f874dc4305f571 Added /NOBUILD option to holdingarea/build.bat This allows cmake to be run without subsequently invoking nmake diff -r 563aa0c4cea3 -r 1a4430846fcf holdingarea/build.bat --- a/holdingarea/build.bat Fri Sep 24 12:02:04 2010 +0100 +++ b/holdingarea/build.bat Fri Sep 24 12:02:56 2010 +0100 @@ -8,6 +8,7 @@ set VISUAL_STUDIO_VERSION=2005 set CMAKE_BUILD_TARGET=Release set VISUAL_STUDIO_SOLUTION=OFF +set BUILD=ON :PARSECOMMANDLINE IF '%1'=='/h' goto PRINTUSAGE @@ -23,6 +24,8 @@ IF '%1'=='/SOLUTION' goto ENABLESOLUTION IF '%1'=='/debug' goto ENABLEDEBUG IF '%1'=='/DEBUG' goto ENABLEDEBUG +IF '%1'=='/nobuild' goto DISABLEBUILD +IF '%1'=='/NOBUILD' goto DISABLEBUILD if "%VISUAL_STUDIO_SOLUTION%"=="ON" ( set GENERATOR=Visual Studio 8 2005 @@ -38,6 +41,7 @@ echo VISUAL_STUDIO_VERSION = %VISUAL_STUDIO_VERSION% echo GENERATOR = %GENERATOR% echo CMAKE_BUILD_TARGET = %CMAKE_BUILD_TARGET% +echo BUILD = %BUILD% echo. rem Execute @@ -47,11 +51,13 @@ cd build cmake -DUSE_MINI_EGL:Bool=%USE_MINI_EGL% -DPLATSIM_EXTENSIONS:Bool=%PLATSIM_EXTENSIONS% -DVISUAL_STUDIO_VERSION:String=%VISUAL_STUDIO_VERSION% -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TARGET% -G "%GENERATOR%" ../.. @echo off +if "%BUILD%"=="ON" ( if "%GENERATOR%"=="NMake Makefiles" ( echo on nmake @echo off ) +) @echo off cd .. @@ -67,6 +73,8 @@ echo [/SOLUTION] just generate VIsual Studio solution files echo (default: generate NMake makefiles and build) echo [/DEBUG] configure for debug build (default: release) +echo [/NOBUILD] call cmake but do not call nmake +echo note: has no effect if /SOLUTION is specified goto END :ENABLEMINIEGL @@ -95,6 +103,11 @@ shift goto PARSECOMMANDLINE +:DISABLEBUILD +set BUILD=OFF +shift +goto PARSECOMMANDLINE + :END