diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-09-06 21:02:23 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-09-19 19:36:13 (GMT) |
| commit | 34c6e995f9ac1c62540b68dd50934c8c0be98b7f (patch) | |
| tree | d68b3f9c23b61a112f41cf3f6a8f2338f5cf03cb /Source/cmMakefileTargetGenerator.cxx | |
| parent | 839c65bca032b80cfa7fe0de2ad35c2448421092 (diff) | |
| download | CMake-34c6e995f9ac1c62540b68dd50934c8c0be98b7f.zip CMake-34c6e995f9ac1c62540b68dd50934c8c0be98b7f.tar.gz CMake-34c6e995f9ac1c62540b68dd50934c8c0be98b7f.tar.bz2 | |
Convert: Avoid HOME_OUTPUT enum when converting to relative paths
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index df06dc1..fc5af4a 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -317,7 +317,7 @@ void cmMakefileTargetGenerator::MacOSXContentGeneratorType::operator()( this->Generator->LocalGenerator->ConvertToRelativePath( this->Generator->LocalGenerator->GetCurrentBinaryDirectory(), output)); output = this->Generator->LocalGenerator->ConvertToRelativePath( - output, cmOutputConverter::HOME_OUTPUT); + this->Generator->LocalGenerator->GetBinaryDirectory(), output); // Create a rule to copy the content into the bundle. std::vector<std::string> depends; @@ -1275,7 +1275,7 @@ void cmMakefileTargetGenerator::WriteTargetDriverRule( std::string buildTargetRuleName = dir; buildTargetRuleName += relink ? "/preinstall" : "/build"; buildTargetRuleName = this->LocalGenerator->ConvertToRelativePath( - buildTargetRuleName, cmOutputConverter::HOME_OUTPUT); + this->LocalGenerator->GetBinaryDirectory(), buildTargetRuleName); // Build the list of target outputs to drive. std::vector<std::string> depends; |