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 },