From 145f956fff5b154c5d0ea86c43ea764e4684d79f Mon Sep 17 00:00:00 2001 From: iFuSiiOnzZ Date: Thu, 6 Sep 2018 12:40:23 +0200 Subject: [PATCH] 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. --- Util/BuildTools/BuildLibCarla.bat | 8 ++++---- Util/BuildTools/BuildPythonAPI.bat | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Util/BuildTools/BuildLibCarla.bat b/Util/BuildTools/BuildLibCarla.bat index dd0f45220..5ac156970 100644 --- a/Util/BuildTools/BuildLibCarla.bat +++ b/Util/BuildTools/BuildLibCarla.bat @@ -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 ) diff --git a/Util/BuildTools/BuildPythonAPI.bat b/Util/BuildTools/BuildPythonAPI.bat index bcc8cb1ca..0e4e5166d 100644 --- a/Util/BuildTools/BuildPythonAPI.bat +++ b/Util/BuildTools/BuildPythonAPI.bat @@ -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 ------------------------------------------------------------