Merge branch '1.4.x'
diff --git a/BUILDING.md b/BUILDING.md
index 04ce30c..e40d136 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -458,7 +458,7 @@
Build Requirements
------------------
-- [CMake](http://www.cmake.org) v2.8.8 or later
+- [CMake](http://www.cmake.org) v2.8.11 or later
- [NASM](http://www.nasm.us/) 0.98 or later (NASM 2.05 or later is required for
a 64-bit build)
@@ -668,11 +668,11 @@
be used directly from Java applications. See [java/README](java/README) for
more details.
-If you are using CMake 2.8, you can set the `Java_JAVAC_EXECUTABLE`,
-`Java_JAVA_EXECUTABLE`, and `Java_JAR_EXECUTABLE` CMake variables to specify
-alternate commands or locations for javac, jar, and java (respectively.) You
-can also set the `JAVACFLAGS` CMake variable to specify arguments that should
-be passed to the Java compiler when building the front-end classes.
+You can set the `Java_JAVAC_EXECUTABLE`, `Java_JAVA_EXECUTABLE`, and
+`Java_JAR_EXECUTABLE` CMake variables to specify alternate commands or
+locations for javac, jar, and java (respectively.) You can also set the
+`JAVACFLAGS` CMake variable to specify arguments that should be passed to the
+Java compiler when building the front-end classes.
Installing libjpeg-turbo
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a453dd1..1c4a46b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
# Setup
#
-cmake_minimum_required(VERSION 2.8.8)
+cmake_minimum_required(VERSION 2.8.11)
# Use LINK_INTERFACE_LIBRARIES instead of INTERFACE_LINK_LIBRARIES
if(POLICY CMP0022)
cmake_policy(SET CMP0022 OLD)
@@ -11,20 +11,12 @@
project(libjpeg-turbo C)
set(VERSION 1.4.90)
-if(WIN32)
- execute_process(COMMAND "wmic.exe" "os" "get" "LocalDateTime" OUTPUT_VARIABLE
- BUILD)
- string(REGEX REPLACE "[^0-9]" "" BUILD "${BUILD}")
- if (BUILD STREQUAL "")
- execute_process(COMMAND "cmd.exe" "/C" "DATE" "/T" OUTPUT_VARIABLE BUILD)
- string(REGEX REPLACE ".*[ ]([0-9]*)[/.]([0-9]*)[/.]([0-9]*).*" "\\3\\2\\1" BUILD "${BUILD}")
- else()
- string(SUBSTRING "${BUILD}" 0 8 BUILD)
- endif()
-else()
+if(NOT WIN32)
message(FATAL_ERROR "Platform not supported by this build system. Use autotools instead.")
endif()
+string(TIMESTAMP BUILD "%Y%m%d")
+
# This does nothing except when using MinGW. CMAKE_BUILD_TYPE has no meaning
# in Visual Studio, and it always defaults to Debug when using NMake.
if(NOT CMAKE_BUILD_TYPE)
