From 5a53e4a2eac36549dfdc43cb80bc8d7bcbffe535 Mon Sep 17 00:00:00 2001 From: Marcel Pi <25649656+MarcelPiNacy@users.noreply.github.com> Date: Tue, 23 Jan 2024 16:48:08 +0100 Subject: [PATCH] Change default boost toolset for linux. --- Configure.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Configure.py b/Configure.py index b841f61f8..32a4f8af6 100644 --- a/Configure.py +++ b/Configure.py @@ -28,6 +28,7 @@ CARLA_UE_CONTENT_VERSIONS_FILE_PATH = WORKSPACE_PATH / 'Util' / 'ContentVersions LOGICAL_PROCESSOR_COUNT = psutil.cpu_count(logical = True) DEFAULT_PARALLELISM = LOGICAL_PROCESSOR_COUNT + (2 if LOGICAL_PROCESSOR_COUNT >= 8 else 0) READTHEDOCS_URL_SUFFIX = 'how_to_build_on_windows/\n' if os.name == "nt" else 'build_linux/\n' +DEFAULT_BOOST_TOOLSET = 'msvc-14.3' if os.name == 'nt' else 'clang' DEFAULT_ERROR_MESSAGE = ( '\n' 'Ok, an error ocurred, don\'t panic!\n' @@ -233,7 +234,7 @@ AddCLIStringOption( 'Set the CARLA build path.') AddCLIStringOption( 'boost-toolset', - 'msvc-14.3', + DEFAULT_BOOST_TOOLSET, 'Set the target boost toolset.') AddCLIStringOption( 'ue-path',