summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2006-02-21 14:35:11 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2006-02-21 14:35:11 (GMT)
commit74d315077cda809777ec6398c1d2a2d99ca99d4c (patch)
tree095e05adeef71e419945c505b9b3e3a54999aee6
parentb6863e9fad3d789cf887075b00a3c9ee997a8e02 (diff)
downloadCMake-74d315077cda809777ec6398c1d2a2d99ca99d4c.zip
CMake-74d315077cda809777ec6398c1d2a2d99ca99d4c.tar.gz
CMake-74d315077cda809777ec6398c1d2a2d99ca99d4c.tar.bz2
ENH: use last mount point found for mingw location, not first
-rw-r--r--Source/cmGlobalMSYSMakefileGenerator.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx
index 3bfa12d..d0b9f37 100644
--- a/Source/cmGlobalMSYSMakefileGenerator.cxx
+++ b/Source/cmGlobalMSYSMakefileGenerator.cxx
@@ -33,17 +33,18 @@ cmGlobalMSYSMakefileGenerator::FindMinGW(std::string const& makeloc)
std::ifstream fin(fstab.c_str());
std::string path;
std::string mount;
+ std::string mingwBin;
while(fin)
{
fin >> path;
fin >> mount;
if(mount == "/mingw")
{
- path += "/bin";
- return path;
+ mingwBin = path;
+ mingwBin += "/bin";
}
}
- return "";
+ return mingwBin;
}
void cmGlobalMSYSMakefileGenerator::EnableLanguage(std::vector<std::string>const& l,