aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakhropov <akhropov@yandex-team.com>2024-09-17 16:03:19 +0300
committerakhropov <akhropov@yandex-team.com>2024-09-17 16:24:06 +0300
commit02ac488195e766d8894f7a166d1aed23946d6e21 (patch)
treea6a2c557f83570f7495cf906dbe38578760eed2a
parent528fd2157137daeb3d185045cc021e92287c1866 (diff)
downloadydb-02ac488195e766d8894f7a166d1aed23946d6e21.tar.gz
Put compiler_executables in quotes to fix issues with paths with spaces in them.
commit_hash:adda1c0216c0412e626f44fe10e9709fa2716e5c
-rw-r--r--build/export_generators/cmake/cmake/conan_provider.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/export_generators/cmake/cmake/conan_provider.cmake b/build/export_generators/cmake/cmake/conan_provider.cmake
index 0d2be004ed..6173fde2a6 100644
--- a/build/export_generators/cmake/cmake/conan_provider.cmake
+++ b/build/export_generators/cmake/cmake/conan_provider.cmake
@@ -328,7 +328,7 @@ macro(append_compiler_executables_configuration)
set(_conan_rc_compiler "")
set(_conan_compilers_list "")
if(CMAKE_C_COMPILER)
- set(_conan_c_compiler "\"c\":\"${CMAKE_C_COMPILER}\"")
+ set(_conan_c_compiler "\"c\":\"\\\"${CMAKE_C_COMPILER}\\\"\"")
set_conan_compiler_if_appleclang(C cc _conan_c_compiler)
list(APPEND _conan_compilers_list ${_conan_c_compiler})
else()
@@ -336,7 +336,7 @@ macro(append_compiler_executables_configuration)
"Please define CMAKE_C_COMPILER or enable the C language.")
endif()
if(CMAKE_CXX_COMPILER)
- set(_conan_cpp_compiler "\"cpp\":\"${CMAKE_CXX_COMPILER}\"")
+ set(_conan_cpp_compiler "\"cpp\":\"\\\"${CMAKE_CXX_COMPILER}\\\"\"")
set_conan_compiler_if_appleclang(CXX c++ _conan_cpp_compiler)
list(APPEND _conan_compilers_list ${_conan_cpp_compiler})
else()
@@ -344,7 +344,7 @@ macro(append_compiler_executables_configuration)
"Please define CMAKE_CXX_COMPILER or enable the C++ language.")
endif()
if(CMAKE_RC_COMPILER)
- set(_conan_rc_compiler "\"rc\":\"${CMAKE_RC_COMPILER}\"")
+ set(_conan_rc_compiler "\"rc\":\"\\\"${CMAKE_RC_COMPILER}\\\"\"")
list(APPEND _conan_compilers_list ${_conan_rc_compiler})
# Not necessary to warn if RC not defined
endif()