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

Setup Visual Studio 2019 for windows

This commit is contained in:
bernatx 2021-07-13 16:43:08 +02:00 committed by bernat
parent 9c2d8aef94
commit e466a63fba
13 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PythonAPI/carla/setup.py
View File

@ -124,7 +124,7 @@ def get_libcarla_extensions():
# https://docs.microsoft.com/es-es/cpp/porting/modifying-winver-and-win32-winnt
extra_compile_args = [
'/experimental:external', '/external:I', 'dependencies/include/system',
'/experimental:external', '/external:W0', '/external:I', 'dependencies/include/system',
'/DBOOST_ALL_NO_LIB', '/DBOOST_PYTHON_STATIC_LIB',
'/DBOOST_ERROR_CODE_HEADER_ONLY', '/D_WIN32_WINNT=0x0600', '/DHAVE_SNPRINTF',
'/DLIBCARLA_WITH_PYTHON_SUPPORT', '-DLIBCARLA_IMAGE_WITH_PNG_SUPPORT=true', '/MD']

6
Util/BuildTools/BuildLibCarla.bat
View File

@ -100,7 +100,7 @@ cd "%LIBCARLA_VSPROJECT_PATH%"
rem Build libcarla server
rem
if %BUILD_SERVER% == true (
cmake -G "Visual Studio 15 2017 Win64"^
cmake -G "Visual Studio 16 2019" -A x64^
-DCMAKE_BUILD_TYPE=Server^
-DCMAKE_CXX_FLAGS_RELEASE="/MD /MP"^
-DCMAKE_INSTALL_PREFIX="%LIBCARLA_SERVER_INSTALL_PATH:\=/%"^
@ -114,7 +114,7 @@ if %BUILD_SERVER% == true (
rem Build libcarla client
rem
if %BUILD_CLIENT% == true (
cmake -G "Visual Studio 15 2017 Win64"^
cmake -G "Visual Studio 16 2019" -A x64^
-DCMAKE_BUILD_TYPE=Client^
-DCMAKE_CXX_FLAGS_RELEASE="/MD /MP"^
-DCMAKE_INSTALL_PREFIX="%LIBCARLA_CLIENT_INSTALL_PATH:\=/%"^
@ -147,7 +147,7 @@ rem ============================================================================
:error_install
echo.
echo %FILE_N% [ERROR] An error ocurred while installing using Visual Studio 15 2017 Win64.
echo %FILE_N% [ERROR] An error ocurred while installing using Visual Studio 16 2019 Win64.
echo [ERROR] Possible causes:
echo [ERROR] - Make sure you have Visual Studio installed.
echo [ERROR] - Make sure you have the "x64 Visual C++ Toolset" in your path.

4
Util/BuildTools/BuildOSM2ODR.bat
View File

@ -95,7 +95,7 @@ if %BUILD_OSM2ODR% == true (
if not exist "%OSM2ODR_VSPROJECT_PATH%" mkdir "%OSM2ODR_VSPROJECT_PATH%"
cd "%OSM2ODR_VSPROJECT_PATH%"
cmake -G "Visual Studio 15 2017 Win64"^
cmake -G "Visual Studio 16 2019" -A x64^
-DCMAKE_CXX_FLAGS_RELEASE="/MD /MP"^
-DCMAKE_INSTALL_PREFIX="%OSM2ODR_INSTALL_PATH:\=/%"^
-DPROJ_INCLUDE_DIR=%INSTALLATION_DIR:/=\%\proj-install\include^
@ -130,7 +130,7 @@ rem ============================================================================
:error_install
echo.
echo %FILE_N% [ERROR] An error ocurred while installing using Visual Studio 15 2017 Win64.
echo %FILE_N% [ERROR] An error ocurred while installing using Visual Studio 16 2019 Win64.
echo [ERROR] Possible causes:
echo [ERROR] - Make sure you have Visual Studio installed.
echo [ERROR] - Make sure you have the "x64 Visual C++ Toolset" in your path.

7
Util/BuildTools/Setup.bat
View File

@ -54,8 +54,8 @@ if not "%1"=="" (
goto :arg-parse
)
rem If not defined, use Visual Studio 2017 as tool set
if "%TOOLSET%" == "" set TOOLSET=msvc-14.1
rem If not defined, use Visual Studio 2019 as tool set
if "%TOOLSET%" == "" set TOOLSET=msvc-14.2
rem If is not set, set the number of parallel jobs to the number of CPU threads
if "%NUMBER_OF_ASYNC_JOBS%" == "" set NUMBER_OF_ASYNC_JOBS=%NUMBER_OF_PROCESSORS%
@ -339,7 +339,8 @@ rem ============================================================================
echo --boost-toolset [T] -^> Toolset corresponding to your compiler ^(default=^*^):
echo Visual Studio 2013 -^> msvc-12.0
echo Visual Studio 2015 -^> msvc-14.0
echo Visual Studio 2017 -^> msvc-14.1 *
echo Visual Studio 2017 -^> msvc-14.1
echo Visual Studio 2019 -^> msvc-14.2 *
goto good_exit
:error_cl

2
Util/BuildTools/Windows.mk
View File

@ -71,7 +71,7 @@ LibCarla: setup
@"${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.bat" --server --client
setup:
@"${CARLA_BUILD_TOOLS_FOLDER}/Setup.bat" --boost-toolset msvc-14.1 $(ARGS)
@"${CARLA_BUILD_TOOLS_FOLDER}/Setup.bat" --boost-toolset msvc-14.2 $(ARGS)
.PHONY: Plugins
plugins:

4
Util/InstallersWin/install_boost.bat
View File

@ -55,8 +55,8 @@ rem If not set set the build dir to the current dir
if "%BUILD_DIR%" == "" set BUILD_DIR=%~dp0
if not "%BUILD_DIR:~-1%"=="\" set BUILD_DIR=%BUILD_DIR%\
rem If not defined, use Visual Studio 2017 as tool set
if "%TOOLSET%" == "" set TOOLSET=msvc-14.1
rem If not defined, use Visual Studio 2019 as tool set
if "%TOOLSET%" == "" set TOOLSET=msvc-14.2
rem If is not set, set the number of parallel jobs to the number of CPU threads
if "%NUMBER_OF_ASYNC_JOBS%" == "" set NUMBER_OF_ASYNC_JOBS=%NUMBER_OF_PROCESSORS%

2
Util/InstallersWin/install_chrono.bat
View File

@ -96,7 +96,7 @@ if not exist %CHRONO_INSTALL_DIR% (
cd "%CHRONO_BUILD_DIR%"
echo %FILE_N% Compiling Chrono.
cmake -G "Visual Studio 15 2017 Win64"^
cmake -G "Visual Studio 16 2019" -A x64^
-DCMAKE_BUILD_TYPE=Release^
-DCMAKE_CXX_FLAGS_RELEASE="/MD /MP"^
-DEIGEN3_INCLUDE_DIR="%EIGEN_INCLUDE%"^

6
Util/InstallersWin/install_gtest.bat
View File

@ -64,7 +64,7 @@ if not exist "%GT_BUILD_DIR%" (
cd "%GT_BUILD_DIR%"
echo %FILE_N% Generating build...
cmake .. -G "Visual Studio 15 2017 Win64"^
cmake .. -G "Visual Studio 16 2019" -A x64^
-DCMAKE_BUILD_TYPE=Release^
-DCMAKE_CXX_FLAGS_RELEASE="/MD /MP"^
-DCMAKE_INSTALL_PREFIX="%GT_INSTALL_DIR:\=/%"^
@ -116,8 +116,8 @@ rem ============================================================================
:error_install
echo.
echo %FILE_N% [Visual Studio 15 2017 Win64 ERROR] An error ocurred while installing using Visual Studio 15 2017 Win64.
echo %FILE_N% [Visual Studio 15 2017 Win64 ERROR] Possible causes:
echo %FILE_N% [Visual Studio 16 2019 Win64 ERROR] An error ocurred while installing using Visual Studio 16 2019 Win64.
echo %FILE_N% [Visual Studio 16 2019 Win64 ERROR] Possible causes:
echo %FILE_N% - Make sure you have Visual Studio installed.
echo %FILE_N% - Make sure you have the "x64 Visual C++ Toolset" in your path.
echo %FILE_N% For example using the "Visual Studio x64 Native Tools Command Prompt",

2
Util/InstallersWin/install_proj.bat
View File

@ -73,7 +73,7 @@ move %BUILD_DIR%%PROJ_BASE_NAME% %PROJ_SRC_DIR%
mkdir %PROJ_BUILD_DIR%
cd %PROJ_BUILD_DIR%
cmake -G "Visual Studio 15 2017 Win64" .. ^
cmake .. -G "Visual Studio 16 2019" -A x64^
-DCMAKE_CXX_FLAGS_RELEASE="/MD /MP"^
-DCMAKE_CXX_FLAGS="/MD /MP"^
-DSQLITE3_INCLUDE_DIR=%SQLITE_INCLUDE_DIR% -DSQLITE3_LIBRARY=%SQLITE_LIB%^

6
Util/InstallersWin/install_recast.bat
View File

@ -68,7 +68,7 @@ if not exist "%RECAST_BUILD_DIR%" (
cd "%RECAST_BUILD_DIR%"
echo %FILE_N% Generating build...
cmake .. -G "Visual Studio 15 2017 Win64"^
cmake .. -G "Visual Studio 16 2019" -A x64^
-DCMAKE_BUILD_TYPE=Release^
-DCMAKE_CXX_FLAGS_RELEASE="/MD /MP"^
-DCMAKE_INSTALL_PREFIX="%RECAST_INSTALL_DIR:\=/%"^
@ -123,8 +123,8 @@ rem ============================================================================
:error_install
echo.
echo %FILE_N% [Visual Studio 15 2017 Win64 ERROR] An error ocurred while installing using Visual Studio 15 2017 Win64.
echo %FILE_N% [Visual Studio 15 2017 Win64 ERROR] Possible causes:
echo %FILE_N% [Visual Studio 16 2019 Win64 ERROR] An error ocurred while installing using Visual Studio 16 2019 Win64.
echo %FILE_N% [Visual Studio 16 2019 Win64 ERROR] Possible causes:
echo %FILE_N% - Make sure you have Visual Studio installed.
echo %FILE_N% - Make sure you have the "x64 Visual C++ Toolset" in your path.
echo %FILE_N% For example using the "Visual Studio x64 Native Tools Command Prompt",

6
Util/InstallersWin/install_rpclib.bat
View File

@ -67,7 +67,7 @@ if not exist "%RPC_BUILD_DIR%" (
cd "%RPC_BUILD_DIR%"
echo %FILE_N% Generating build...
cmake .. -G "Visual Studio 15 2017 Win64"^
cmake .. -G "Visual Studio 16 2019" -A x64^
-DCMAKE_BUILD_TYPE=Release^
-DRPCLIB_BUILD_EXAMPLES=OFF^
-DCMAKE_CXX_FLAGS_RELEASE="/MD /MP"^
@ -120,8 +120,8 @@ rem ============================================================================
:error_install
echo.
echo %FILE_N% [Visual Studio 15 2017 Win64 ERROR] An error ocurred while installing using Visual Studio 15 2017 Win64.
echo %FILE_N% [Visual Studio 15 2017 Win64 ERROR] Possible causes:
echo %FILE_N% [Visual Studio 16 2019 Win64 ERROR] An error ocurred while installing using Visual Studio 16 2019 Win64.
echo %FILE_N% [Visual Studio 16 2019 Win64 ERROR] Possible causes:
echo %FILE_N% - Make sure you have Visual Studio installed.
echo %FILE_N% - Make sure you have the "x64 Visual C++ Toolset" in your path.
echo %FILE_N% For example using the "Visual Studio x64 Native Tools Command Prompt",

2
Util/InstallersWin/install_xercesc.bat
View File

@ -115,7 +115,7 @@ if not exist "%XERCESC_INSTALL_DIR%include" (
mkdir "%XERCESC_INSTALL_DIR%include"
)
cmake -G "Visual Studio 15 2017 Win64"^
cmake .. -G "Visual Studio 16 2019" -A x64^
-DCMAKE_INSTALL_PREFIX="%XERCESC_INSTALL_DIR:\=/%"^
-DBUILD_SHARED_LIBS=OFF^
"%BUILD_DIR%%XERCESC_BASENAME%-%XERCESC_VERSION%-source"

2
Util/InstallersWin/install_zlib.bat
View File

@ -40,7 +40,7 @@ rem If not set set the build dir to the current dir
if "%BUILD_DIR%" == "" set BUILD_DIR=%~dp0
if not "%BUILD_DIR:~-1%"=="\" set BUILD_DIR=%BUILD_DIR%\
rem If not defined, use Visual Studio 2017 as tool set
rem If not defined, use Visual Studio 2019 as tool set
if "%TOOLSET%" == "" set TOOLSET=""
rem ============================================================================