From 6ee86983a4cd5f5cbaee905c74e4e7d705822cd2 Mon Sep 17 00:00:00 2001 From: MarcelPiNacy-CVC <169088301+MarcelPiNacy-CVC@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:00:41 +0200 Subject: [PATCH] Make toolchain paths absolute. (#8200) --- CMake/Common.cmake | 13 +++++++++++++ CMakePresets.json | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CMake/Common.cmake b/CMake/Common.cmake index f8f72642c..41c1b8b50 100644 --- a/CMake/Common.cmake +++ b/CMake/Common.cmake @@ -33,6 +33,19 @@ if (WIN32) endif () endif () +if (CMAKE_TOOLCHAIN_FILE) + cmake_path ( + ABSOLUTE_PATH + CMAKE_TOOLCHAIN_FILE + BASE_DIRECTORY + ${CARLA_WORKSPACE_PATH} + NORMALIZE + OUTPUT_VARIABLE + TOOLCHAIN_FILE + ) + set (CMAKE_TOOLCHAIN_FILE ${TOOLCHAIN_FILE}) +endif () + # ================================ # Common Definitions # ================================ diff --git a/CMakePresets.json b/CMakePresets.json index 18f281e80..3a6723180 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -20,7 +20,7 @@ "inherits": "Common", "cacheVariables": { - "CMAKE_TOOLCHAIN_FILE": "CMake/LinuxToolchain.cmake" + "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/CMake/LinuxToolchain.cmake" }, "hidden": true },