diff options
| author | Brad King <brad.king@kitware.com> | 2018-08-28 17:42:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-08-28 17:43:48 (GMT) |
| commit | 9da844d8cbbd2c525265a551421dbf126ef328d1 (patch) | |
| tree | 9fd769530113738b78a66da8a6cf97089543266e /Source/cmGeneratorTarget.cxx | |
| parent | 6f7c96fb178a290934b5b91c919ddff143d8b542 (diff) | |
| parent | 50fbfee3a02e7099a3909d81597f4b8047847ece (diff) | |
| download | CMake-9da844d8cbbd2c525265a551421dbf126ef328d1.zip CMake-9da844d8cbbd2c525265a551421dbf126ef328d1.tar.gz CMake-9da844d8cbbd2c525265a551421dbf126ef328d1.tar.bz2 | |
Merge topic 'lg-directory'
50fbfee3a0 cmLocalGenerator: return directories as const std::string&
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2309
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 0b3a945..eb1852d 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -3606,8 +3606,9 @@ bool cmGeneratorTarget::StrictTargetComparison::operator()( { int nameResult = strcmp(t1->GetName().c_str(), t2->GetName().c_str()); if (nameResult == 0) { - return strcmp(t1->GetLocalGenerator()->GetCurrentBinaryDirectory(), - t2->GetLocalGenerator()->GetCurrentBinaryDirectory()) < 0; + return strcmp( + t1->GetLocalGenerator()->GetCurrentBinaryDirectory().c_str(), + t2->GetLocalGenerator()->GetCurrentBinaryDirectory().c_str()) < 0; } return nameResult < 0; } |