diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-05-11 18:39:30 (GMT) |
---|---|---|
committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-05-11 18:39:30 (GMT) |
commit | 72a9a5546f7fa4ab09c6db6208faf8bcdea81730 (patch) | |
tree | 7c098b7c769de3931fbc7ed23950611239e9c867 /Source/cmSystemTools.cxx | |
parent | 1a2af3f58318d6cf76260493e9db2f0df9d17ba7 (diff) | |
download | CMake-72a9a5546f7fa4ab09c6db6208faf8bcdea81730.zip CMake-72a9a5546f7fa4ab09c6db6208faf8bcdea81730.tar.gz CMake-72a9a5546f7fa4ab09c6db6208faf8bcdea81730.tar.bz2 |
BUG: fix find library for unix
Diffstat (limited to 'Source/cmSystemTools.cxx')
-rw-r--r-- | Source/cmSystemTools.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 9966222..3b2070c 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -687,7 +687,7 @@ bool cmSystemTools::RunCommand(const char* command, fgets(buffer, BUFFER_SIZE, cpipe); while(!feof(cpipe)) { - std::cout << buffer; + std::cout << buffer << std::flush; output += buffer; fgets(buffer, BUFFER_SIZE, cpipe); } @@ -779,23 +779,23 @@ std::string cmSystemTools::FindLibrary(const char* name, tryPath = *p; tryPath += "/lib"; tryPath += name; - tryPath + ".so"; + tryPath += ".so"; if(cmSystemTools::FileExists(tryPath.c_str())) { return cmSystemTools::CollapseFullPath(tryPath.c_str()); } tryPath = *p; - tryPath = "/lib"; + tryPath += "/lib"; tryPath += name; - tryPath + ".a"; + tryPath += ".a"; if(cmSystemTools::FileExists(tryPath.c_str())) { return cmSystemTools::CollapseFullPath(tryPath.c_str()); } tryPath = *p; - tryPath = "/lib"; + tryPath += "/lib"; tryPath += name; - tryPath + ".sl"; + tryPath += ".sl"; if(cmSystemTools::FileExists(tryPath.c_str())) { return cmSystemTools::CollapseFullPath(tryPath.c_str()); @@ -886,7 +886,6 @@ void cmSystemTools::SplitProgramPath(const char* in_name, */ std::string cmSystemTools::CollapseFullPath(const char* in_name) { - std::cerr << "CollapseFullPath " << in_name << "\n"; std::string dir, file; cmSystemTools::SplitProgramPath(in_name, dir, file); // Ultra-hack warning: |