mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'mk-directory'

Browse Source 
c8fd23ec6f cmMakefile: return directories as const std::string&

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2311
This commit is contained in:
Brad King
2018-08-28 17:42:36 +00:00
committed by Kitware Robot
parent c549deed7f c8fd23ec6f
commit 6f7c96fb17
21 changed files with 65 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmTargetSourcesCommand.cxx
View File

@@ -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;