diff options
| author | Rechi <Rechi@users.noreply.github.com> | 2018-10-13 09:00:00 +0200 |
|---|---|---|
| committer | Rechi <Rechi@users.noreply.github.com> | 2018-10-13 09:00:00 +0200 |
| commit | 556f85e617b9619cf14eb076a992daf890de3ad6 (patch) | |
| tree | cb15b73fa14771268c9ba921fb7445acab5fba3e /tools/buildsteps/windows | |
| parent | a213712cab44a4599fd66d1c95c3a252be8cd596 (diff) | |
[windows] pass ADDONS_TO_BUILD only if give as argument
cmake already has the logic to check which addons exist
Diffstat (limited to 'tools/buildsteps/windows')
| -rw-r--r-- | tools/buildsteps/windows/make-addons.bat | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/tools/buildsteps/windows/make-addons.bat b/tools/buildsteps/windows/make-addons.bat index c4ddc8f90e..45c30eb5f1 100644 --- a/tools/buildsteps/windows/make-addons.bat +++ b/tools/buildsteps/windows/make-addons.bat @@ -35,7 +35,6 @@ SET SCRIPTS_PATH=%BASE_PATH%\scripts\windows%store% SET ADDONS_PATH=%BASE_PATH%\addons SET ADDON_DEPENDS_PATH=%ADDONS_PATH%\output SET ADDONS_BUILD_PATH=%ADDONS_PATH%\build -SET ADDONS_DEFINITION_PATH=%ADDONS_PATH%\addons SET ADDONS_SUCCESS_FILE=%ADDONS_PATH%\.success SET ADDONS_FAILURE_FILE=%ADDONS_PATH%\.failure @@ -82,19 +81,12 @@ ECHO -------------------------------------------------- ECHO Building addons ECHO -------------------------------------------------- -SET ADDONS_TO_BUILD= IF "%addon%" NEQ "" ( - SET ADDONS_TO_BUILD=%addon% -) ELSE ( - SETLOCAL EnableDelayedExpansion - FOR /D %%a IN (%ADDONS_DEFINITION_PATH%\*) DO ( - SET ADDONS_TO_BUILD=!ADDONS_TO_BUILD! %%~nxa - ) - SETLOCAL DisableDelayedExpansion + SET CMAKE_EXTRA=%CMAKE_EXTRA% -DADDONS_TO_BUILD="%addon%" ) IF "%store%" NEQ "" ( -SET STORE_ARGS=-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=%UCRTVersion% + SET CMAKE_EXTRA=%CMAKE_EXTRA% -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=%UCRTVersion% ) rem execute cmake to generate makefiles processable by nmake @@ -107,8 +99,7 @@ cmake "%ADDONS_PATH%" -G "NMake Makefiles" ^ -DBUILD_DIR=%ADDONS_BUILD_PATH% ^ -DADDON_DEPENDS_PATH=%ADDON_DEPENDS_PATH% ^ -DPACKAGE_ZIP=ON ^ - %STORE_ARGS% ^ - -DADDONS_TO_BUILD="%ADDONS_TO_BUILD%" + %CMAKE_EXTRA% IF ERRORLEVEL 1 ( ECHO cmake error level: %ERRORLEVEL% > %ERRORFILE% |