diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-08 17:26:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-10-08 17:26:44 (GMT) |
| commit | 265fb0cdc72fc46347ae0b8964078ca6d0a978e1 (patch) | |
| tree | 02f9cf4b527f2663046099d2cac527c6cd88ebc1 /Source | |
| parent | 8083285d1bd5ecc31afa5fa689a9a4ca13ca8bb9 (diff) | |
| download | CMake-265fb0cdc72fc46347ae0b8964078ca6d0a978e1.zip CMake-265fb0cdc72fc46347ae0b8964078ca6d0a978e1.tar.gz CMake-265fb0cdc72fc46347ae0b8964078ca6d0a978e1.tar.bz2 | |
cmFileTimeComparison: Update for lack of cmsys_STAT_HAS_ST_MTIM
The KWSys Configure.hxx header no longer exposes this value.
Take the value from the KWSys try compile result variable instead.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | Source/cmFileTimeComparison.cxx | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index ae5b03f..28a3fd1 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -548,6 +548,18 @@ foreach(v CURL_CA_BUNDLE CURL_CA_PATH) endif() endforeach() +foreach(check + STAT_HAS_ST_MTIM + ) + if(KWSYS_CXX_${check}_COMPILED) # abuse KWSys check cache entry + set(CMake_${check} 1) + else() + set(CMake_${check} 0) + endif() + set_property(SOURCE cmFileTimeComparison.cxx APPEND PROPERTY + COMPILE_DEFINITIONS CMake_${check}=${CMake_${check}}) +endforeach() + # create a library used by the command line and the GUI add_library(CMakeLib ${SRCS}) target_link_libraries(CMakeLib cmsys diff --git a/Source/cmFileTimeComparison.cxx b/Source/cmFileTimeComparison.cxx index 13e2a66..8d5e08d 100644 --- a/Source/cmFileTimeComparison.cxx +++ b/Source/cmFileTimeComparison.cxx @@ -148,7 +148,7 @@ int cmFileTimeComparisonInternal::Compare(cmFileTimeComparison_Type* s1, cmFileTimeComparison_Type* s2) { #if !defined(_WIN32) || defined(__CYGWIN__) -# if cmsys_STAT_HAS_ST_MTIM +# if CMake_STAT_HAS_ST_MTIM // Compare using nanosecond resolution. if(s1->st_mtim.tv_sec < s2->st_mtim.tv_sec) { @@ -190,7 +190,7 @@ bool cmFileTimeComparisonInternal::TimesDiffer(cmFileTimeComparison_Type* s1, cmFileTimeComparison_Type* s2) { #if !defined(_WIN32) || defined(__CYGWIN__) -# if cmsys_STAT_HAS_ST_MTIM +# if CMake_STAT_HAS_ST_MTIM // Times are integers in units of 1ns. long long bil = 1000000000; long long t1 = s1->st_mtim.tv_sec * bil + s1->st_mtim.tv_nsec; |