Make sure that Java is disabled when 12-bit is enabled (Java requires TurboJPEG,...

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.4.x@1584 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3295deaf0f09365fdaf378bdb9b299cbc378c9f1..5ee91a4fb8f348d32c19aec4dce017b67e39db48 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,6 +59,7 @@ option(ENABLE_SHARED "Build shared libraries" TRUE)
 if(WITH_12BIT)
   set(WITH_SIMD FALSE)
   set(WITH_TURBOJPEG FALSE)
+  set(WITH_JAVA FALSE)
   set(WITH_ARITH_ENC FALSE)
   set(WITH_ARITH_DEC FALSE)
   set(BITS_IN_JSAMPLE 12)
@@ -290,8 +291,8 @@ if(WITH_12BIT)
   set(COMPILE_FLAGS "-DGIF_SUPPORTED -DPPM_SUPPORTED -DUSE_SETMODE")
 else()
   set(COMPILE_FLAGS "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED -DUSE_SETMODE")
-       set(CJPEG_BMP_SOURCES rdbmp.c rdtarga.c)
-       set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c)
+  set(CJPEG_BMP_SOURCES rdbmp.c rdtarga.c)
+  set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c)
 endif()
 
 if(ENABLE_STATIC)