diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-02-21 12:58:01 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-02-21 12:58:01 (GMT) |
| commit | b6863e9fad3d789cf887075b00a3c9ee997a8e02 (patch) | |
| tree | 8afcdd1caa4d1a375d26a19e0482548797dea2ac /Source/cmGlobalMSYSMakefileGenerator.cxx | |
| parent | 9e2049ffc37d4779d59a9e07115b8645ba8be077 (diff) | |
| download | CMake-b6863e9fad3d789cf887075b00a3c9ee997a8e02.zip CMake-b6863e9fad3d789cf887075b00a3c9ee997a8e02.tar.gz CMake-b6863e9fad3d789cf887075b00a3c9ee997a8e02.tar.bz2 | |
ENH: try to get the order a bit better
Diffstat (limited to 'Source/cmGlobalMSYSMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalMSYSMakefileGenerator.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx index 8643857..3bfa12d 100644 --- a/Source/cmGlobalMSYSMakefileGenerator.cxx +++ b/Source/cmGlobalMSYSMakefileGenerator.cxx @@ -53,12 +53,10 @@ void cmGlobalMSYSMakefileGenerator::EnableLanguage(std::vector<std::string>const std::string makeProgram = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM"); std::vector<std::string> locations; std::string makeloc = cmSystemTools::GetProgramPath(makeProgram.c_str()); - locations.push_back(makeloc); locations.push_back(this->FindMinGW(makeloc)); + locations.push_back(makeloc); locations.push_back("/mingw/bin"); - locations.push_back("/msys/1.0/bin"); locations.push_back("c:/mingw/bin"); - locations.push_back("C:/msys/1.0/bin"); std::string tgcc = cmSystemTools::FindProgram("gcc", locations); std::string gcc = "gcc.exe"; if(tgcc.size()) |