diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-15 13:44:17 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-04-15 13:44:48 (GMT) |
| commit | a67565751f848dfb4fe7a497f3c3e99581805c33 (patch) | |
| tree | 1dac16219431fd4c0cda47b1b502ee4cad6518ee /Source/cmGlobalXCodeGenerator.cxx | |
| parent | 0a6b715c5c25e396916c86e761b54a917c83807a (diff) | |
| parent | bc877a7e944d2a83867b4d55073fe3f83bcecc42 (diff) | |
| download | CMake-a67565751f848dfb4fe7a497f3c3e99581805c33.zip CMake-a67565751f848dfb4fe7a497f3c3e99581805c33.tar.gz CMake-a67565751f848dfb4fe7a497f3c3e99581805c33.tar.bz2 | |
Merge topic 'msbuildUtf8Support'
bc877a7e94 Add support to indicate UTF-8 custom command pipe output encoding
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4587
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index bdc03c7..c7d7133 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1464,6 +1464,7 @@ void cmGlobalXCodeGenerator::CreateCustomCommands( cmStrCat("$<TARGET_SONAME_FILE:", gtgt->GetName(), '>'); std::string str_link_file = cmStrCat("$<TARGET_LINKER_FILE:", gtgt->GetName(), '>'); + bool stdPipesUTF8 = true; cmCustomCommandLines cmd = cmMakeSingleCommandLine( { cmSystemTools::GetCMakeCommand(), "-E", "cmake_symlink_library", str_file, str_so_file, str_link_file }); @@ -1471,7 +1472,7 @@ void cmGlobalXCodeGenerator::CreateCustomCommands( cmCustomCommand command( std::vector<std::string>(), std::vector<std::string>(), std::vector<std::string>(), cmd, this->CurrentMakefile->GetBacktrace(), - "Creating symlinks", ""); + "Creating symlinks", "", stdPipesUTF8); postbuild.push_back(std::move(command)); } |