[libcxx] [CMake] Convert paths to the right form in standalone builds on Windows

[mstorsjo]

Summary

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).

[smeenai]

Looks good with the quotes added.

cmake/Modules/HandleCompilerRT.cmake

17 ↗

(On Diff #152047)

Nit: cmake recommends always putting quotes around the path argument to ensure it's treated as a single argument, i.e.

file(TO_CMAKE_PATH "${LIBRARY_FILE}" LIBRARY_FILE)

That needs to happen in all other uses as well.

cmake/Modules/HandleOutOfTreeLLVM.cmake

52 ↗

(On Diff #152047)

Is there ever a chance LLVM_BINARY_DIR will have backslashes, or are you just being extra careful (or going for consistency)?

[mstorsjo]

cmake/Modules/HandleCompilerRT.cmake

17 ↗

(On Diff #152047)

Ok, will do.

cmake/Modules/HandleOutOfTreeLLVM.cmake

52 ↗

(On Diff #152047)

I'm mostly just going for consistency and copy+paste; this path identically matches a part from compiler-rt/cmake/Modules/CompilerRTUtils.cmake - and that part actually seems to have been added intentionally to fix some case: https://reviews.llvm.org/rL203789

[smeenai]

cmake/Modules/HandleOutOfTreeLLVM.cmake

52 ↗

(On Diff #152047)

Fair enough; sounds good to me.

libcxx/trunk/cmake/Modules/HandleCompilerRT.cmake

 function(find_compiler_rt_library name dest)
   if (NOT DEFINED LIBCXX_COMPILE_FLAGS)
     message(FATAL_ERROR "LIBCXX_COMPILE_FLAGS must be defined when using this function")
   endif()
   set(dest "" PARENT_SCOPE)
   set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBCXX_COMPILE_FLAGS}
       "--rtlib=compiler-rt" "--print-libgcc-file-name")
   if (CMAKE_CXX_COMPILER_ID MATCHES Clang AND CMAKE_CXX_COMPILER_TARGET)
     list(APPEND CLANG_COMMAND "--target=${CMAKE_CXX_COMPILER_TARGET}")
   endif()
   execute_process(
       COMMAND ${CLANG_COMMAND}
       RESULT_VARIABLE HAD_ERROR
       OUTPUT_VARIABLE LIBRARY_FILE
   )
   string(STRIP "${LIBRARY_FILE}" LIBRARY_FILE)
+  file(TO_CMAKE_PATH "${LIBRARY_FILE}" LIBRARY_FILE)
   string(REPLACE "builtins" "${name}" LIBRARY_FILE "${LIBRARY_FILE}")
   if (NOT HAD_ERROR AND EXISTS "${LIBRARY_FILE}")
     message(STATUS "Found compiler-rt library: ${LIBRARY_FILE}")
     set(${dest} "${LIBRARY_FILE}" PARENT_SCOPE)
   else()
     message(STATUS "Failed to find compiler-rt library")
   endif()
 endfunction()
 
 function(find_compiler_rt_dir dest)
   if (NOT DEFINED LIBCXX_COMPILE_FLAGS)
     message(FATAL_ERROR "LIBCXX_COMPILE_FLAGS must be defined when using this function")
   endif()
   set(dest "" PARENT_SCOPE)
   if (APPLE)
     set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBCXX_COMPILE_FLAGS}
         "-print-file-name=lib")
     execute_process(
         COMMAND ${CLANG_COMMAND}
         RESULT_VARIABLE HAD_ERROR
         OUTPUT_VARIABLE LIBRARY_DIR
     )
     string(STRIP "${LIBRARY_DIR}" LIBRARY_DIR)
+    file(TO_CMAKE_PATH "${LIBRARY_DIR}" LIBRARY_DIR)
     set(LIBRARY_DIR "${LIBRARY_DIR}/darwin")
   else()
     set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBCXX_COMPILE_FLAGS}
         "--rtlib=compiler-rt" "--print-libgcc-file-name")
     execute_process(
         COMMAND ${CLANG_COMMAND}
         RESULT_VARIABLE HAD_ERROR
         OUTPUT_VARIABLE LIBRARY_FILE
     )
     string(STRIP "${LIBRARY_FILE}" LIBRARY_FILE)
+    file(TO_CMAKE_PATH "${LIBRARY_FILE}" LIBRARY_FILE)
     get_filename_component(LIBRARY_DIR "${LIBRARY_FILE}" DIRECTORY)
   endif()
   if (NOT HAD_ERROR AND EXISTS "${LIBRARY_DIR}")
     message(STATUS "Found compiler-rt directory: ${LIBRARY_DIR}")
     set(${dest} "${LIBRARY_DIR}" PARENT_SCOPE)
   else()
     message(STATUS "Failed to find compiler-rt directory")
   endif()
 endfunction()

libcxx/trunk/cmake/Modules/HandleOutOfTreeLLVM.cmake

elseif(LLVM_CONFIG_PATH)
 
     # --cmakedir is supported since llvm r291218 (4.0 release)
     execute_process(
       COMMAND ${LLVM_CONFIG_PATH} --cmakedir
       RESULT_VARIABLE HAD_ERROR
       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)
     message(WARNING "UNSUPPORTED LIBCXX CONFIGURATION DETECTED: "
                     "llvm-config not found and LLVM_PATH not defined.\n"
                     "Reconfigure with -DLLVM_CONFIG_PATH=path/to/llvm-config "
                     "or -DLLVM_PATH=path/to/llvm-source-root.")
     return()