diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-20 14:01:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-20 14:03:48 (GMT) |
| commit | c2f6da3399efa1448eadbae65311795ced3f8930 (patch) | |
| tree | 22029ba1982f7d4964772abfc78a0fc1a9f1d44a /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | b38023f958325fedd99d5480149f4958e721fdd5 (diff) | |
| parent | 0281f9a4cad6e189601a87c9ccfba8c54e71e14b (diff) | |
| download | CMake-c2f6da3399efa1448eadbae65311795ced3f8930.zip CMake-c2f6da3399efa1448eadbae65311795ced3f8930.tar.gz CMake-c2f6da3399efa1448eadbae65311795ced3f8930.tar.bz2 | |
Merge topic 'configurefile-stdstring'
0281f9a4ca cmMakefile::ConfigureFile: Accept `std::string` parameters
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2982
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 00a2d74..6ee82f4 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -622,8 +622,8 @@ void cmVisualStudio10TargetGenerator::Generate() propsLocal += this->DefaultArtifactDir; propsLocal += "\\nasm.props"; ConvertToWindowsSlash(propsLocal); - this->Makefile->ConfigureFile(propsTemplate.c_str(), - propsLocal.c_str(), false, true, true); + this->Makefile->ConfigureFile(propsTemplate, propsLocal, false, true, + true); Elem(e1, "Import").Attribute("Project", propsLocal); } } |