Skip to content

Commit 92111a2

Browse files
committed
Fixing Recast pulling by branch instead of hash id
1 parent 43b5e70 commit 92111a2

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

Util/BuildTools/Setup.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -331,9 +331,7 @@ unset GTEST_BASENAME
331331
# -- Get Recast&Detour and compile it with libc++ ------------------------------
332332
# ==============================================================================
333333

334-
RECAST_HASH=0b13b0
335-
RECAST_COMMIT=0b13b0d288ac96fdc5347ee38299511c6e9400db
336-
RECAST_BASENAME=recast-${RECAST_HASH}-${CXX_TAG}
334+
RECAST_BASENAME=recast-${CXX_TAG}
337335

338336
RECAST_INCLUDE=${PWD}/${RECAST_BASENAME}-install/include
339337
RECAST_LIBPATH=${PWD}/${RECAST_BASENAME}-install/lib
@@ -353,7 +351,7 @@ else
353351

354352
pushd ${RECAST_BASENAME}-source >/dev/null
355353

356-
git reset --hard ${RECAST_COMMIT}
354+
git checkout carla
357355

358356
popd >/dev/null
359357

@@ -794,7 +792,7 @@ if ${USE_PYTORCH} ; then
794792
cp -p ${LIBTORCH_LIB}/*.so* ${LIBCARLA_INSTALL_SERVER_FOLDER}/lib/
795793
cp -p ${LIBTORCHSCATTER_LIB}/*.so ${LIBCARLA_INSTALL_SERVER_FOLDER}/lib/
796794
cp -p ${LIBTORCHCLUSTER_LIB}/*.so ${LIBCARLA_INSTALL_SERVER_FOLDER}/lib/
797-
795+
798796
mkdir -p ${CARLAUE4_PLUGIN_ROOT_FOLDER}/Binaries/Linux/
799797
cp -p ${LIBTORCH_LIB}/*.so* ${CARLAUE4_PLUGIN_ROOT_FOLDER}/Binaries/Linux/
800798
cp -p ${LIBTORCHSCATTER_LIB}/*.so* ${CARLAUE4_PLUGIN_ROOT_FOLDER}/Binaries/Linux/

Util/InstallersWin/install_recast.bat

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@ rem If not set set the build dir to the current dir
3535
if "%BUILD_DIR%" == "" set BUILD_DIR=%~dp0
3636
if not "%BUILD_DIR:~-1%"=="\" set BUILD_DIR=%BUILD_DIR%\
3737

38-
set RECAST_HASH=0b13b0
39-
set RECAST_COMMIT=0b13b0d288ac96fdc5347ee38299511c6e9400db
40-
set RECAST_SRC=recast-%RECAST_HASH%-src
38+
set RECAST_SRC=recast-src
4139
set RECAST_SRC_DIR=%BUILD_DIR%%RECAST_SRC%\
42-
set RECAST_INSTALL=recast-%RECAST_HASH%-install
40+
set RECAST_INSTALL=recast-install
4341
set RECAST_INSTALL_DIR=%BUILD_DIR%%RECAST_INSTALL%\
4442
set RECAST_BUILD_DIR=%RECAST_SRC_DIR%build\
4543
set RECAST_BASENAME=%RECAST_SRC%
@@ -53,7 +51,7 @@ if not exist "%RECAST_SRC_DIR%" (
5351

5452
call git clone https://github.com/carla-simulator/recastnavigation.git "%RECAST_SRC_DIR:~0,-1%"
5553
cd "%RECAST_SRC_DIR%"
56-
call git reset --hard %RECAST_COMMIT%
54+
call git checkout carla
5755
cd ..
5856
if %errorlevel% neq 0 goto error_git
5957
) else (

0 commit comments

Comments
 (0)