diff options
| author | Brad King <brad.king@kitware.com> | 2006-08-09 15:43:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-08-09 15:43:35 (GMT) |
| commit | dd37d0652f6e0d0355e5d81011ae2a97a045d2eb (patch) | |
| tree | 0944685eb1459ae2302f563cff8fa4faae3eb0c1 /Source | |
| parent | fe3d8078c5dc9b1bd762a0d0f51966bc78a14a79 (diff) | |
| download | CMake-dd37d0652f6e0d0355e5d81011ae2a97a045d2eb.zip CMake-dd37d0652f6e0d0355e5d81011ae2a97a045d2eb.tar.gz CMake-dd37d0652f6e0d0355e5d81011ae2a97a045d2eb.tar.bz2 | |
ENH: Changed preprocessed source extension to .i and assembly extension to .s for more portability.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 4 | ||||
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 94cbdf1..0640e0d 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -306,13 +306,13 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile() { this->WriteObjectConvenienceRule( ruleFileStream, "target to preprocess a source file", - (base + ".E").c_str(), lo->second); + (base + ".i").c_str(), lo->second); } if(do_assembly_rules) { this->WriteObjectConvenienceRule( ruleFileStream, "target to generate assembly for a file", - (base + ".S").c_str(), lo->second); + (base + ".s").c_str(), lo->second); } } } diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index c85a981..ae65daa 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -509,12 +509,12 @@ cmMakefileTargetGenerator if(do_preprocess_rules) { commands.clear(); - std::string relativeObjE = relativeObjBase + ".E"; + std::string relativeObjI = relativeObjBase + ".i"; std::string preprocessEcho = "Preprocessing "; preprocessEcho += lang; preprocessEcho += " source to "; - preprocessEcho += relativeObjE; + preprocessEcho += relativeObjI; this->LocalGenerator->AppendEcho( commands, preprocessEcho.c_str(), cmLocalUnixMakefileGenerator3::EchoBuild @@ -528,7 +528,7 @@ cmMakefileTargetGenerator { cmSystemTools::ExpandListArgument(preprocessRule, commands); - vars.PreprocessedSource = relativeObjE.c_str(); + vars.PreprocessedSource = relativeObjI.c_str(); // Expand placeholders in the commands. for(std::vector<std::string>::iterator i = commands.begin(); @@ -545,14 +545,14 @@ cmMakefileTargetGenerator } this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0, - relativeObjE.c_str(), + relativeObjI.c_str(), force_depends, commands, false); } if(do_assembly_rules) { commands.clear(); - std::string relativeObjS = relativeObjBase + ".S"; + std::string relativeObjS = relativeObjBase + ".s"; std::string assemblyEcho = "Compiling "; assemblyEcho += lang; |