diff options
| author | Martin Storsjo <martin@martin.st> | 2018-06-20 21:03:34 +0000 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2018-06-20 21:03:34 +0000 |
| commit | 11b02759a342ea04709d509b6231d318d551f319 (patch) | |
| tree | ee8668761f98098e9910c680de327727c4dcbbce /libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake | |
| parent | dd75eb531ded76380cd39f953aba9913a811fb6d (diff) | |
| download | bcm5719-llvm-11b02759a342ea04709d509b6231d318d551f319.tar.gz bcm5719-llvm-11b02759a342ea04709d509b6231d318d551f319.zip | |
[CMake] Convert paths to the right form in standalone builds on Windows
The paths output from llvm-config --cmakedir and from clang
--print-libgcc-file-name can contain backslashes, while CMake
can't handle the paths in this form.
This matches what compiler-rt already does (since SVN r203789
and r293195).
Differential Revision: https://reviews.llvm.org/D48356
llvm-svn: 335172
Diffstat (limited to 'libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake')
| -rw-r--r-- | libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake b/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake index 83948b14fd1..70eed1d70ba 100644 --- a/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake +++ b/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake @@ -46,10 +46,11 @@ macro(find_llvm_parts) OUTPUT_VARIABLE CONFIG_OUTPUT ERROR_QUIET) if(NOT HAD_ERROR) - string(STRIP "${CONFIG_OUTPUT}" LLVM_CMAKE_PATH) + string(STRIP "${CONFIG_OUTPUT}" LLVM_CMAKE_PATH_FROM_LLVM_CONFIG) + file(TO_CMAKE_PATH "${LLVM_CMAKE_PATH_FROM_LLVM_CONFIG}" LLVM_CMAKE_PATH) else() - set(LLVM_CMAKE_PATH - "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") + file(TO_CMAKE_PATH "${LLVM_BINARY_DIR}" LLVM_BINARY_DIR_CMAKE_STYLE) + set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR_CMAKE_STYLE}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") endif() else() set(LLVM_FOUND OFF) |
