diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-07 13:33:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-07 13:33:11 (GMT) |
| commit | 0dcb436fab6f21b5e5ada5ee2acb04870447ab37 (patch) | |
| tree | 1140f94a5348c180d7f7b126895b9436f5793e02 /Modules | |
| parent | b743ffbfa2b10709338c970037b5a663e375509d (diff) | |
| parent | 2e831e4a17b387f733dc18b06ebcecd775a774dd (diff) | |
| download | CMake-0dcb436fab6f21b5e5ada5ee2acb04870447ab37.zip CMake-0dcb436fab6f21b5e5ada5ee2acb04870447ab37.tar.gz CMake-0dcb436fab6f21b5e5ada5ee2acb04870447ab37.tar.bz2 | |
Merge topic 'compiler-sysroot-slashes'
2e831e4a17 Windows: Normalize slashes in compiler -print-sysroot path
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4715
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompiler.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCompiler.cmake b/Modules/CMakeDetermineCompiler.cmake index da93b5c..7cd7c47 100644 --- a/Modules/CMakeDetermineCompiler.cmake +++ b/Modules/CMakeDetermineCompiler.cmake @@ -141,7 +141,8 @@ function(_cmake_find_compiler_sysroot lang) ERROR_VARIABLE _cmake_sysroot_run_err) if(_cmake_sysroot_run_out AND NOT _cmake_sysroot_run_err AND IS_DIRECTORY "${_cmake_sysroot_run_out}/usr") - set(CMAKE_${lang}_COMPILER_SYSROOT "${_cmake_sysroot_run_out}/usr" PARENT_SCOPE) + file(TO_CMAKE_PATH "${_cmake_sysroot_run_out}/usr" _cmake_sysroot_run_out_usr) + set(CMAKE_${lang}_COMPILER_SYSROOT "${_cmake_sysroot_run_out_usr}" PARENT_SCOPE) else() set(CMAKE_${lang}_COMPILER_SYSROOT "" PARENT_SCOPE) endif() |