diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-10-13 14:07:12 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-10-13 14:07:12 (GMT) |
| commit | 6a67b1bf71499fe64927c48580ed33c9b5853e6e (patch) | |
| tree | 681c33cbcc484ee85c762855499143b1ab9da8be | |
| parent | f2b8c8f31a6baa6c9b69a9e94be69d39667c5f24 (diff) | |
| download | CMake-6a67b1bf71499fe64927c48580ed33c9b5853e6e.zip CMake-6a67b1bf71499fe64927c48580ed33c9b5853e6e.tar.gz CMake-6a67b1bf71499fe64927c48580ed33c9b5853e6e.tar.bz2 | |
BUG: Fix logic to return true when the file was already statted. Also, use nanosecond percision if available. Remove debug
| -rw-r--r-- | Source/cmDepends.cxx | 1 | ||||
| -rw-r--r-- | Source/cmFileTimeComparison.cxx | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmDepends.cxx b/Source/cmDepends.cxx index d66efb4..068c451 100644 --- a/Source/cmDepends.cxx +++ b/Source/cmDepends.cxx @@ -89,7 +89,6 @@ void cmDepends::Clear(const char *file) std::string markFile = file; markFile += ".mark"; cmSystemTools::RemoveFile(markFile.c_str()); - std::cout << "Remove mark file: " << markFile.c_str() << std::endl; // Write an empty dependency file. cmGeneratedFileStream depFileStream(file); diff --git a/Source/cmFileTimeComparison.cxx b/Source/cmFileTimeComparison.cxx index b4c603e..4f9af52 100644 --- a/Source/cmFileTimeComparison.cxx +++ b/Source/cmFileTimeComparison.cxx @@ -65,7 +65,7 @@ bool cmFileTimeComparisonInternal::Stat(const char* fname, cmFileTimeComparison_ if ( fit != this->Files.end() ) { *st = fit->second; - return 0; + return true; } #endif #if !defined(_WIN32) || defined(__CYGWIN__) @@ -114,7 +114,7 @@ bool cmFileTimeComparison::FileTimeCompare(const char* f1, const char* f2, int* int cmFileTimeComparisonInternal::Compare(cmFileTimeComparison_Type* s1, cmFileTimeComparison_Type* s2) { #if !defined(_WIN32) || defined(__CYGWIN__) -# if KWSYS_STAT_HAS_ST_MTIM +# if cmsys_STAT_HAS_ST_MTIM // Compare using nanosecond resolution. if(s1->st_mtim.tv_sec < s2->st_mtim.tv_sec) { @@ -142,8 +142,8 @@ int cmFileTimeComparisonInternal::Compare(cmFileTimeComparison_Type* s1, cmFileT { return 1; } - return 0; # endif + return 0; #else return (int)CompareFileTime(s1, s2); #endif |