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:
@@ -19,7 +19,7 @@ SOURCE_DIRECTORY=${PWD}
|
||||
ECHO Configuring for iOS Testing
|
||||
|
||||
LAST_CONFIGURE_CMD_FILE=ci_last_configure_cmd.txt
|
||||
CONFIGURE_CMD="cmake -B ${OUTPUT_DIRECTORY} ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS} -DLY_3RDPARTY_PATH=${LY_3RDPARTY_PATH}"
|
||||
CONFIGURE_CMD="cmake -B ${OUTPUT_DIRECTORY} ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS}"
|
||||
if [[ ! -e "CMakeCache.txt" ]]; then
|
||||
echo [ci_build] First run, generating
|
||||
RUN_CONFIGURE=1
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"ENV": {
|
||||
"NODE_LABEL": "mac-bigsur-2fc3a22",
|
||||
"LY_3RDPARTY_PATH": "/Users/lybuilder/3rdParty",
|
||||
"LY_3RDPARTY_PATH": "/Users/lybuilder/workspace/3rdParty",
|
||||
"TIMEOUT": 30,
|
||||
"WORKSPACE": "/Users/lybuilder/workspace",
|
||||
"MOUNT_VOLUME": false
|
||||
|
||||
Reference in New Issue
Block a user