diff options
author | Brad King <brad.king@kitware.com> | 2018-08-28 17:42:36 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2018-08-28 17:42:43 (GMT) |
commit | 6f7c96fb178a290934b5b91c919ddff143d8b542 (patch) | |
tree | 4f7b80f56fd419a829d6ccb282b833604efa83f7 /Source/cmTargetSourcesCommand.cxx | |
parent | c549deed7fc6dec2c3f5f3ab5f9ded1acb916239 (diff) | |
parent | c8fd23ec6f33eef8cf11d81938c379590080bd19 (diff) | |
download | CMake-6f7c96fb178a290934b5b91c919ddff143d8b542.zip CMake-6f7c96fb178a290934b5b91c919ddff143d8b542.tar.gz CMake-6f7c96fb178a290934b5b91c919ddff143d8b542.tar.bz2 |
Merge topic 'mk-directory'
c8fd23ec6f cmMakefile: return directories as const std::string&
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2311
Diffstat (limited to 'Source/cmTargetSourcesCommand.cxx')
-rw-r--r-- | Source/cmTargetSourcesCommand.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmTargetSourcesCommand.cxx b/Source/cmTargetSourcesCommand.cxx index c57d68b..7429053 100644 --- a/Source/cmTargetSourcesCommand.cxx +++ b/Source/cmTargetSourcesCommand.cxx @@ -2,7 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmTargetSourcesCommand.h" -#include <cstring> #include <sstream> #include "cmAlgorithms.h" @@ -71,8 +70,8 @@ std::vector<std::string> cmTargetSourcesCommand::ConvertToAbsoluteContent( if (cmSystemTools::FileIsFullPath(src) || cmGeneratorExpression::Find(src) == 0 || (!isInterfaceContent && - strcmp(this->Makefile->GetCurrentSourceDirectory(), - tgt->GetMakefile()->GetCurrentSourceDirectory()) == 0)) { + (this->Makefile->GetCurrentSourceDirectory() == + tgt->GetMakefile()->GetCurrentSourceDirectory()))) { absoluteSrc = src; } else { changedPath = true; |