diff options
| author | Brad King <brad.king@kitware.com> | 2023-12-07 14:18:34 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-12-07 14:18:43 (GMT) |
| commit | 7693a8152dd4ad81ef36000e98f09e9de639c0df (patch) | |
| tree | 3f06bbb0248b313d9b48b75f77fd91108968d488 | |
| parent | b2b0d839c1db57e9b8078882e3d366fff6f1fb4a (diff) | |
| parent | 3f2a5971c02450e24bc8852a84dcd136fae5de18 (diff) | |
| download | CMake-7693a8152dd4ad81ef36000e98f09e9de639c0df.zip CMake-7693a8152dd4ad81ef36000e98f09e9de639c0df.tar.gz CMake-7693a8152dd4ad81ef36000e98f09e9de639c0df.tar.bz2 | |
Merge topic 'win-path'
3f2a5971c0 Modules: CMAKE_*_COMPILER convert path to cmake path
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9027
| -rw-r--r-- | Modules/CMakeDetermineCompiler.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineCompiler.cmake b/Modules/CMakeDetermineCompiler.cmake index 0e41829..fc0b714 100644 --- a/Modules/CMakeDetermineCompiler.cmake +++ b/Modules/CMakeDetermineCompiler.cmake @@ -120,6 +120,10 @@ macro(_cmake_find_compiler_path lang) # CMAKE_${lang}_COMPILER and the rest as CMAKE_${lang}_COMPILER_ARG1 # Otherwise, preserve any existing CMAKE_${lang}_COMPILER_ARG1 that might # have been saved by CMakeDetermine${lang}Compiler in a previous run. + + # Necessary for Windows paths to avoid improper escaping of backslashes + cmake_path(CONVERT "${CMAKE_${lang}_COMPILER}" TO_CMAKE_PATH_LIST CMAKE_${lang}_COMPILER NORMALIZE) + list(LENGTH CMAKE_${lang}_COMPILER _CMAKE_${lang}_COMPILER_LENGTH) if(_CMAKE_${lang}_COMPILER_LENGTH GREATER 1) set(CMAKE_${lang}_COMPILER_ARG1 "${CMAKE_${lang}_COMPILER}") |