From: DRC <information@libjpeg-turbo.org>
Date: Tue, 26 Apr 2016 00:08:47 +0000 (-0500)
Subject: Merge branch '1.4.x'
X-Git-Tag: 1.5.0~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=346837cad3f5166d3d8ea8a65c9ba6eff97c59b0;p=libjpeg-turbo

Merge branch '1.4.x'
---

346837cad3f5166d3d8ea8a65c9ba6eff97c59b0
diff --cc CMakeLists.txt
index bfb7661,425e3cd..a453dd1
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -9,12 -9,9 +9,9 @@@ if(POLICY CMP0022
  endif()
  
  project(libjpeg-turbo C)
 -set(VERSION 1.4.3)
 +set(VERSION 1.4.90)
  
- if(CYGWIN OR NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
-   execute_process(COMMAND "date" "+%Y%m%d" OUTPUT_VARIABLE BUILD)
-   string(REGEX REPLACE "\n" "" BUILD ${BUILD})
- elseif(WIN32)
+ if(WIN32)
    execute_process(COMMAND "wmic.exe" "os" "get" "LocalDateTime" OUTPUT_VARIABLE
      BUILD)
    string(REGEX REPLACE "[^0-9]" "" BUILD "${BUILD}")