diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-28 12:21:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-28 12:22:35 (GMT) |
| commit | 825e19b81f04acf4dc95b905c337656ce28c6848 (patch) | |
| tree | e78afd488d70fb1d96bb210a03146a0efe9c6999 | |
| parent | 7c99b7d5dafdbff264b5b8d7e96ec81f0c4892cd (diff) | |
| parent | e67d9c6e3139ec545cc90935e0d2cf7b97f1b709 (diff) | |
| download | CMake-825e19b81f04acf4dc95b905c337656ce28c6848.zip CMake-825e19b81f04acf4dc95b905c337656ce28c6848.tar.gz CMake-825e19b81f04acf4dc95b905c337656ce28c6848.tar.bz2 | |
Merge topic 'sysroot-prefix' into release-3.18
e67d9c6e31 Compilers: Ignore -print-sysroot prefix when it is '/'
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5066
| -rw-r--r-- | Modules/CMakeDetermineCompiler.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCompiler.cmake b/Modules/CMakeDetermineCompiler.cmake index 7cd7c47..cb1ab1d 100644 --- a/Modules/CMakeDetermineCompiler.cmake +++ b/Modules/CMakeDetermineCompiler.cmake @@ -140,7 +140,9 @@ function(_cmake_find_compiler_sysroot lang) OUTPUT_VARIABLE _cmake_sysroot_run_out 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") + if(_cmake_sysroot_run_out AND NOT _cmake_sysroot_run_err + AND NOT _cmake_sysroot_run_out STREQUAL "/" + AND IS_DIRECTORY "${_cmake_sysroot_run_out}/usr") 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() |