From e4acce1ab4fa3d5bde4fc954e129df11b5732ee2 Mon Sep 17 00:00:00 2001 From: mary-dcouto Date: Mon, 14 Mar 2022 13:35:46 +0530 Subject: [PATCH] use Ninja to build --- ziti-edge-tunnel/build.bat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ziti-edge-tunnel/build.bat b/ziti-edge-tunnel/build.bat index c7c946db..8ba480e5 100644 --- a/ziti-edge-tunnel/build.bat +++ b/ziti-edge-tunnel/build.bat @@ -195,7 +195,7 @@ if "%ZITI_SDK_C_BRANCH%"=="" ( SET ZITI_SDK_C_BRANCH_CMD=-DZITI_SDK_C_BRANCH=%ZITI_SDK_C_BRANCH% ) -cmake -G "MinGW Makefiles" -S %TUNNELER_SDK_DIR% -B %TUNNELER_SDK_DIR%build -DCMAKE_INSTALL_PREFIX=%TUNNELER_SDK_DIR%install -DCMAKE_TOOLCHAIN_FILE=%TUNNELER_SDK_DIR%\toolchains\default.cmake %ZITI_SDK_C_BRANCH_CMD% %ZITI_DEBUG_CMAKE% +cmake -G Ninja -S %TUNNELER_SDK_DIR% -B %TUNNELER_SDK_DIR%build -DCMAKE_INSTALL_PREFIX=%TUNNELER_SDK_DIR%install -DCMAKE_TOOLCHAIN_FILE=%TUNNELER_SDK_DIR%\toolchains\default.cmake %ZITI_SDK_C_BRANCH_CMD% %ZITI_DEBUG_CMAKE% SET ACTUAL_ERR=%ERRORLEVEL% if %ACTUAL_ERR% NEQ 0 ( @@ -205,7 +205,7 @@ if %ACTUAL_ERR% NEQ 0 ( goto FAIL ) else ( echo. - echo result of mingw build: %ACTUAL_ERR% + echo result of ninja build: %ACTUAL_ERR% ) cmake --build %TUNNELER_SDK_DIR%build --target bundle --verbose @@ -213,12 +213,12 @@ cmake --build %TUNNELER_SDK_DIR%build --target bundle --verbose SET ACTUAL_ERR=%ERRORLEVEL% if %ACTUAL_ERR% NEQ 0 ( echo. - echo Build of %TUNNELER_SDK_DIR%build failed + echo Bundle command of %TUNNELER_SDK_DIR%build failed echo. goto FAIL ) else ( echo. - echo result of ninja build: %ACTUAL_ERR% + echo result of cmake bundle: %ACTUAL_ERR% ) echo checking the CSDK