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/cmLocalCommonGenerator.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/cmLocalCommonGenerator.cxx')
| -rw-r--r-- | Source/cmLocalCommonGenerator.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmLocalCommonGenerator.cxx b/Source/cmLocalCommonGenerator.cxx index 0e79293..97323c9 100644 --- a/Source/cmLocalCommonGenerator.cxx +++ b/Source/cmLocalCommonGenerator.cxx @@ -18,8 +18,9 @@ class cmGlobalGenerator; -cmLocalCommonGenerator::cmLocalCommonGenerator( - cmGlobalGenerator* gg, cmMakefile* mf, cmOutputConverter::RelativeRoot wd) +cmLocalCommonGenerator::cmLocalCommonGenerator(cmGlobalGenerator* gg, + cmMakefile* mf, + std::string const& wd) : cmLocalGenerator(gg, mf) , WorkingDirectory(wd) { @@ -55,8 +56,9 @@ std::string cmLocalCommonGenerator::GetTargetFortranFlags( // Add a module output directory flag if necessary. std::string mod_dir = target->GetFortranModuleDirectory(); if (!mod_dir.empty()) { - mod_dir = - this->Convert(mod_dir, this->WorkingDirectory, cmOutputConverter::SHELL); + mod_dir = this->ConvertToOutputFormat( + this->ConvertToRelativePath(this->WorkingDirectory, mod_dir), + cmOutputConverter::SHELL); } else { mod_dir = this->Makefile->GetSafeDefinition("CMAKE_Fortran_MODDIR_DEFAULT"); |