diff options
| author | Geoff Viola <geoffrey.viola@asirobots.com> | 2015-09-06 05:15:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-09-09 14:15:37 (GMT) |
| commit | 04de900704c24567521dd29c0bdb46786eea5e71 (patch) | |
| tree | 1ce1dd7acd034d139e52787008b0fea92f43160b /Source/cmGhsMultiTargetGenerator.cxx | |
| parent | fbe0de92f0cec56d12219125547edced7b3fd413 (diff) | |
| download | CMake-04de900704c24567521dd29c0bdb46786eea5e71.zip CMake-04de900704c24567521dd29c0bdb46786eea5e71.tar.gz CMake-04de900704c24567521dd29c0bdb46786eea5e71.tar.bz2 | |
GHS: Fix generated file path slashes and quoting for 6.1.6
Diffstat (limited to 'Source/cmGhsMultiTargetGenerator.cxx')
| -rw-r--r-- | Source/cmGhsMultiTargetGenerator.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx index 8216824..cae5c2f 100644 --- a/Source/cmGhsMultiTargetGenerator.cxx +++ b/Source/cmGhsMultiTargetGenerator.cxx @@ -452,14 +452,17 @@ void cmGhsMultiTargetGenerator::WriteSources( this->Makefile->GetHomeOutputDirectory(), sgPath, GhsMultiGpj::SUBPROJECT, this->RelBuildFilePath); - if ((*si)->GetExtension() == ".int") + std::string fullSourcePath((*si)->GetFullPath()); + if ((*si)->GetExtension() == "int" || (*si)->GetExtension() == "bsp") { - *this->FolderBuildStreams[sgPath] << "\"" << (*si)->GetFullPath() << "\"" - << std::endl; + *this->FolderBuildStreams[sgPath] << fullSourcePath << std::endl; } else { - *this->FolderBuildStreams[sgPath] << (*si)->GetFullPath() << std::endl; + //WORKAROUND: GHS MULTI needs the path to use backslashes without quotes + // to open files in search as of version 6.1.6 + cmsys::SystemTools::ReplaceString(fullSourcePath, "/", "\\"); + *this->FolderBuildStreams[sgPath] << fullSourcePath << std::endl; } if ("ld" != (*si)->GetExtension() && "int" != (*si)->GetExtension() && |