Fix the build of the Java classes when using MSVC 2010 and later. Something in the...

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 ba604b43f5283e0b52a12e37e14b73866ce3513d..d0af65e3ea4f81ca0a25ca3fc186fb2187fc3d51 100644 (file)
--- 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 4b51ad37c86f9b7392214406ecc591059fc515b8..df0041e108a86a1d2b4f0db982ae8f779123a1fd 100644 (file)
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -26,6 +26,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
 =====

diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index 87db412e8e4a1da1ceb095b116483998a699f50a..19127e30bdcb77653114e00caf70ce4ab98dd093 100644 (file)
--- a/java/CMakeLists.txt
+++ b/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()