diff options
author | Stephen Kelly <steveire@gmail.com> | 2016-08-27 16:32:49 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2016-09-19 19:36:14 (GMT) |
commit | dc510919443eced785ea972c2a7433c440dacd4f (patch) | |
tree | 6f8fdb3831b5a4cead1d3dac30eb475b75280bf8 /Source/cmCommonTargetGenerator.cxx | |
parent | 76833149ec9f7d8605df901deceedc4b9c1c673a (diff) | |
download | CMake-dc510919443eced785ea972c2a7433c440dacd4f.zip CMake-dc510919443eced785ea972c2a7433c440dacd4f.tar.gz CMake-dc510919443eced785ea972c2a7433c440dacd4f.tar.bz2 |
Common: Use a string instead of enum for WorkingDirectory
Diffstat (limited to 'Source/cmCommonTargetGenerator.cxx')
-rw-r--r-- | Source/cmCommonTargetGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx index 6167e2c..df68280 100644 --- a/Source/cmCommonTargetGenerator.cxx +++ b/Source/cmCommonTargetGenerator.cxx @@ -204,8 +204,9 @@ std::string cmCommonTargetGenerator::GetManifests() std::vector<std::string> manifests; for (std::vector<cmSourceFile const*>::iterator mi = manifest_srcs.begin(); mi != manifest_srcs.end(); ++mi) { - manifests.push_back(this->Convert( - (*mi)->GetFullPath(), this->LocalGenerator->GetWorkingDirectory(), + manifests.push_back(this->LocalGenerator->ConvertToOutputFormat( + this->LocalGenerator->ConvertToRelativePath( + this->LocalGenerator->GetWorkingDirectory(), (*mi)->GetFullPath()), cmOutputConverter::SHELL)); } |