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/trunk@1149 632fc199-4ca6-4c93-a231-07263d6284db

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.80)

ChangeLog.txt

@@ -61,6 +61,9 @@ libjpeg-turbo to use uninitialized memory during decompression.
 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
 =====

java/CMakeLists.txt

@@ -13,7 +13,7 @@ set(JAVA_CLASSNAMES org/libjpegturbo/turbojpeg/TJ
   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()