diff options
Diffstat (limited to 'Source/cmGlobalMSYSMakefileGenerator.cxx')
-rw-r--r-- | Source/cmGlobalMSYSMakefileGenerator.cxx | 51 |
1 files changed, 21 insertions, 30 deletions
diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx index 88eb4f38cf..6bf178af90 100644 --- a/Source/cmGlobalMSYSMakefileGenerator.cxx +++ b/Source/cmGlobalMSYSMakefileGenerator.cxx @@ -26,8 +26,8 @@ cmGlobalMSYSMakefileGenerator::cmGlobalMSYSMakefileGenerator(cmake* cm) cm->GetState()->SetMSYSShell(true); } -std::string -cmGlobalMSYSMakefileGenerator::FindMinGW(std::string const& makeloc) +std::string cmGlobalMSYSMakefileGenerator::FindMinGW( + std::string const& makeloc) { std::string fstab = makeloc; fstab += "/../etc/fstab"; @@ -35,23 +35,19 @@ cmGlobalMSYSMakefileGenerator::FindMinGW(std::string const& makeloc) std::string path; std::string mount; std::string mingwBin; - while(fin) - { + while (fin) { fin >> path; fin >> mount; - if(mount == "/mingw") - { + if (mount == "/mingw") { mingwBin = path; mingwBin += "/bin"; - } } + } return mingwBin; } -void cmGlobalMSYSMakefileGenerator -::EnableLanguage(std::vector<std::string>const& l, - cmMakefile *mf, - bool optional) +void cmGlobalMSYSMakefileGenerator::EnableLanguage( + std::vector<std::string> const& l, cmMakefile* mf, bool optional) { this->FindMakeProgram(mf); std::string makeProgram = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM"); @@ -63,40 +59,35 @@ void cmGlobalMSYSMakefileGenerator locations.push_back("c:/mingw/bin"); std::string tgcc = cmSystemTools::FindProgram("gcc", locations); std::string gcc = "gcc.exe"; - if(!tgcc.empty()) - { + if (!tgcc.empty()) { gcc = tgcc; - } + } std::string tgxx = cmSystemTools::FindProgram("g++", locations); std::string gxx = "g++.exe"; - if(!tgxx.empty()) - { + if (!tgxx.empty()) { gxx = tgxx; - } + } std::string trc = cmSystemTools::FindProgram("windres", locations); std::string rc = "windres.exe"; - if(!trc.empty()) - { + if (!trc.empty()) { rc = trc; - } + } mf->AddDefinition("MSYS", "1"); mf->AddDefinition("CMAKE_GENERATOR_CC", gcc.c_str()); mf->AddDefinition("CMAKE_GENERATOR_CXX", gxx.c_str()); mf->AddDefinition("CMAKE_GENERATOR_RC", rc.c_str()); this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional); - if(!mf->IsSet("CMAKE_AR") && - !this->CMakeInstance->GetIsInTryCompile() && - !(1==l.size() && l[0]=="NONE")) - { - cmSystemTools::Error - ("CMAKE_AR was not found, please set to archive program. ", - mf->GetDefinition("CMAKE_AR")); - } + if (!mf->IsSet("CMAKE_AR") && !this->CMakeInstance->GetIsInTryCompile() && + !(1 == l.size() && l[0] == "NONE")) { + cmSystemTools::Error( + "CMAKE_AR was not found, please set to archive program. ", + mf->GetDefinition("CMAKE_AR")); + } } -void cmGlobalMSYSMakefileGenerator -::GetDocumentation(cmDocumentationEntry& entry) +void cmGlobalMSYSMakefileGenerator::GetDocumentation( + cmDocumentationEntry& entry) { entry.Name = cmGlobalMSYSMakefileGenerator::GetActualName(); entry.Brief = "Generates MSYS makefiles."; |