Reading 3rdparty from manifest if it exists (#5840)
* Reading 3rdparty from manifest if it exists, removnig the need to pass it across the board, updated jenkins paths so 3rdparty is put into the workspace Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Removes unneded space Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Changes how we get the NDK folder Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * needs delayed expansion Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Ninja is in the path, is not needed for Android Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
@@ -29,7 +29,7 @@ REM Compute half the amount of processors so some jobs can run
|
||||
SET /a HALF_PROCESSORS = NUMBER_OF_PROCESSORS / 2
|
||||
|
||||
SET LAST_CONFIGURE_CMD_FILE=ci_last_configure_cmd.txt
|
||||
SET CONFIGURE_CMD=cmake %SOURCE_DIRECTORY% %CMAKE_OPTIONS% %EXTRA_CMAKE_OPTIONS% -DLY_3RDPARTY_PATH="%LY_3RDPARTY_PATH%"
|
||||
SET CONFIGURE_CMD=cmake %SOURCE_DIRECTORY% %CMAKE_OPTIONS% %EXTRA_CMAKE_OPTIONS%
|
||||
IF NOT "%CMAKE_LY_PROJECTS%"=="" (
|
||||
SET CONFIGURE_CMD=!CONFIGURE_CMD! -DLY_PROJECTS="%CMAKE_LY_PROJECTS%"
|
||||
)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"ENV": {
|
||||
"NODE_LABEL": "windows-b3c8994f1",
|
||||
"LY_3RDPARTY_PATH": "C:/ly/3rdParty",
|
||||
"LY_3RDPARTY_PATH": "D:/workspace/3rdParty",
|
||||
"TIMEOUT": 30,
|
||||
"WORKSPACE": "D:/workspace",
|
||||
"MOUNT_VOLUME": true
|
||||
|
||||
Reference in New Issue
Block a user