]> granicus.if.org Git - libjpeg-turbo/commitdiff
Merge branch '1.4.x'
authorDRC <information@libjpeg-turbo.org>
Tue, 26 Apr 2016 00:08:47 +0000 (19:08 -0500)
committerDRC <information@libjpeg-turbo.org>
Tue, 26 Apr 2016 00:08:47 +0000 (19:08 -0500)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
index bfb7661a101236acb7cad1a90954111c7e73cfed,425e3cdb537fc8c92a4fdbd6b7981c56ed153290..a453dd103957f7abf664ef1977765d08525a4b6d
@@@ -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}")