p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove intall path folder check 

For "CarlaLIB" and "PythonAPI" don't check if the a build already exists, as the build check is done by the compiler and intallation check is done by cmake.
This commit is contained in:
iFuSiiOnzZ 2018-09-06 12:40:23 +02:00 committed by nsubiron
parent b0d15a17d7
commit 145f956fff
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Util/BuildTools/BuildLibCarla.bat
View File

@ -86,21 +86,21 @@ cd "%LIBCARLA_VSPROJECT_PATH%"
rem Build libcarla server
rem
if %BUILD_SERVER% == true if not exist "%LIBCARLA_SERVER_INSTALL_PATH%" (
if %BUILD_SERVER% == true (
cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Server -DCMAKE_CXX_FLAGS_RELEASE="/MD /MP" -DCMAKE_INSTALL_PREFIX=%LIBCARLA_SERVER_INSTALL_PATH% %ROOT_PATH%
if %errorlevel% neq 0 goto error_cmake
cmake --build . --config Release --target install
cmake --build . --config Release --target install | findstr /V "Up-to-date:"
if %errorlevel% neq 0 goto error_install
)
rem Build libcarla client
rem
if %BUILD_CLIENT% == true if not exist "%LIBCARLA_CLIENT_INSTALL_PATH%" (
if %BUILD_CLIENT% == true (
cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Client -DCMAKE_CXX_FLAGS_RELEASE="/MD /MP" -DCMAKE_INSTALL_PREFIX=%LIBCARLA_CLIENT_INSTALL_PATH% %ROOT_PATH%
if %errorlevel% neq 0 goto error_cmake
cmake --build . --config Release --target install
cmake --build . --config Release --target install | findstr /V "Up-to-date:"
if %errorlevel% neq 0 goto error_install
)

2
Util/BuildTools/BuildPythonAPI.bat
View File

@ -83,7 +83,7 @@ if %REMOVE_INTERMEDIATE% == true (
)
cd "%PYTHON_LIB_PATH%"
if exist "%PYTHON_LIB_PATH%dist" goto already_installed
rem if exist "%PYTHON_LIB_PATH%dist" goto already_installed
rem ============================================================================
rem -- Check for py ------------------------------------------------------------