Fix the build of the Java classes when using MSVC 2010 and later. Something in the recesses of my brain is telling me that I tried this before and it failed under some circumstances, but it must have been a bug in an older CMake implementation. CMake 2.8.8 and later seem to work fine with this patch. This patch also updates the minimum required version to 2.8.8, because 2.8.8 fixed another issue that was preventing the SIMD code from building under MSVC 2010 and later.
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@1148 632fc199-4ca6-4c93-a231-07263d6284db
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba604b4..d0af65e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
# Setup
#
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.8)
project(libjpeg-turbo C)
set(VERSION 1.3.1)
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4b51ad3..df0041e 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -26,6 +26,9 @@
when calling the TurboJPEG YUV encoding function with a very small (< 5x5)
source image, and added a unit test to check for this error.
+[6] The Java classes should now build properly under Visual Studio 2010 and
+later.
+
1.3.0
=====
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index 87db412..19127e3 100644
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -13,7 +13,7 @@
TJBench)
if(MSVC_IDE)
- set(OBJDIR "${CMAKE_CURRENT_BINARY_DIR}/$(OutDir)")
+ set(OBJDIR "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}")
else()
set(OBJDIR ${CMAKE_CURRENT_BINARY_DIR})
endif()