diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-05-25 19:22:22 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-05-25 19:22:22 (GMT) |
| commit | f4eb541880bfc89456e26d8b3eb62ec590571da5 (patch) | |
| tree | 4e549a05db829d9e7fd3324e3f687e0aa2499c65 /Source/cmFileCommand.cxx | |
| parent | 1ed238c7f5f1e2573beb864ea7b2b0c5be4508f2 (diff) | |
| download | CMake-f4eb541880bfc89456e26d8b3eb62ec590571da5.zip CMake-f4eb541880bfc89456e26d8b3eb62ec590571da5.tar.gz CMake-f4eb541880bfc89456e26d8b3eb62ec590571da5.tar.bz2 | |
ENH: make the compiler id detection work, even if the output file name of
the compiler is completely unknown and even if it produces intel hex or
motorola s-record files, with test
Alex
Diffstat (limited to 'Source/cmFileCommand.cxx')
| -rw-r--r-- | Source/cmFileCommand.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index ed3ac2c..5b3390d 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -15,6 +15,8 @@ =========================================================================*/ #include "cmFileCommand.h" +#include "cmake.h" +#include "cmHexFileConverter.h" #include <sys/types.h> #include <sys/stat.h> @@ -414,6 +416,14 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args) return false; } } + + std::string binaryFileName = this->Makefile->GetCurrentOutputDirectory(); + binaryFileName += cmake::GetCMakeFilesDirectory(); + binaryFileName += "/FileCommandStringsBinaryFile"; + if (cmHexFileConverter::TryConvert(fileName.c_str(), binaryFileName.c_str())) + { + fileName = binaryFileName; + } // Open the specified file. #if defined(_WIN32) || defined(__CYGWIN__) |