Make toolchain paths absolute. (#8200)

2024-09-26 15:00:41 +02:00 · 2024-09-26 15:00:41 +02:00 · 6ee86983a4
parent 4bbcfd2370
commit 6ee86983a4
2 changed files with 14 additions and 1 deletions
--- 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
 # ================================
--- 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
    },