diff options
| author | Brad King <brad.king@kitware.com> | 2019-08-23 14:03:33 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-08-23 14:03:57 (GMT) |
| commit | 7f2bb732fc2b684f5b36c522d75ae50faaabab45 (patch) | |
| tree | cca3f50e8efed9a8997d95d1e9f3b26948500a3e /Source/cmGetPropertyCommand.cxx | |
| parent | 68126f5a02b7d21b0d632b9e2c63687b71b3f5fa (diff) | |
| parent | 9b334397f55b70689ff1d8f7d6767a34834e85b6 (diff) | |
| download | CMake-7f2bb732fc2b684f5b36c522d75ae50faaabab45.zip CMake-7f2bb732fc2b684f5b36c522d75ae50faaabab45.tar.gz CMake-7f2bb732fc2b684f5b36c522d75ae50faaabab45.tar.bz2 | |
Merge topic 'source_sweep_cmStrCat'
9b334397f5 Source sweep: Use cmStrCat for string concatenation
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rolf Eike Beer <eike@sf-mail.de>
Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
Merge-request: !3699
Diffstat (limited to 'Source/cmGetPropertyCommand.cxx')
| -rw-r--r-- | Source/cmGetPropertyCommand.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx index 2f720f0..e8e87e7 100644 --- a/Source/cmGetPropertyCommand.cxx +++ b/Source/cmGetPropertyCommand.cxx @@ -15,6 +15,7 @@ #include "cmPropertyDefinition.h" #include "cmSourceFile.h" #include "cmState.h" +#include "cmStringAlgorithms.h" #include "cmSystemTools.h" #include "cmTarget.h" #include "cmTargetPropertyComputer.h" @@ -261,9 +262,8 @@ bool HandleDirectoryMode(cmExecutionStatus& status, const std::string& name, // respect to the current directory. std::string dir = name; if (!cmSystemTools::FileIsFullPath(dir)) { - dir = status.GetMakefile().GetCurrentSourceDirectory(); - dir += "/"; - dir += name; + dir = + cmStrCat(status.GetMakefile().GetCurrentSourceDirectory(), '/', name); } // The local generators are associated with collapsed paths. |