Просмотр исходного кода

Merge topic 'import-std-windows-path' into release-4.3

aac53316e8 c++modules: Fix clang `*.modules.json` path on Windows

Acked-by: Kitware Robot <[email protected]>
Merge-request: !11759
Brad King 1 месяц назад
Родитель
Сommit
d3d2ad487d
1 измененных файлов с 2 добавлено и 1 удалено
  1. 2 1
      Modules/Compiler/Clang-CXX-CXXImportStd.cmake

+ 2 - 1
Modules/Compiler/Clang-CXX-CXXImportStd.cmake

@@ -23,7 +23,8 @@ function (_cmake_cxx_find_modules_json)
       set(CMAKE_CXX_COMPILER_IMPORT_STD_ERROR_MESSAGE "Could not find `${_clang_modules_json_impl}.modules.json` resource" PARENT_SCOPE)
       return ()
     endif ()
-    set(CMAKE_CXX_STDLIB_MODULES_JSON "${_clang_libcxx_modules_json_file}" PARENT_SCOPE)
+    cmake_path(CONVERT "${_clang_libcxx_modules_json_file}" TO_CMAKE_PATH_LIST CMAKE_CXX_STDLIB_MODULES_JSON NORMALIZE)
+    set(CMAKE_CXX_STDLIB_MODULES_JSON "${CMAKE_CXX_STDLIB_MODULES_JSON}" PARENT_SCOPE)
   endif ()
 
   if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "18.1.2" AND