--- imageworks-OpenColorIO-a16d9ac/CMakeLists.txt.orig 2012-07-28 20:56:34.841655834 +0200 +++ imageworks-OpenColorIO-a16d9ac/CMakeLists.txt 2012-07-29 08:42:26.369878509 +0200 @@ -278,7 +278,7 @@ if(OCIO_BUILD_JNIGLUE) OCIOFindJava() - if(Java_FOUND) + if(JAVA_FOUND) add_subdirectory(src/jniglue) else() messageonce("Java bindings will not be built as we can't find Java") --- imageworks-OpenColorIO-a16d9ac/src/jniglue/JNIUtil.h.orig 2012-03-12 20:13:59.000000000 +0100 +++ imageworks-OpenColorIO-a16d9ac/src/jniglue/JNIUtil.h 2012-07-29 08:50:30.273191536 +0200 @@ -29,6 +29,7 @@ #ifndef INCLUDED_OCIO_JNIUTIL_H #define INCLUDED_OCIO_JNIUTIL_H +#include #include #include #include "OpenColorIOJNI.h" --- imageworks-OpenColorIO-2b12063/src/jniglue/CMakeLists.txt.orig 2013-10-09 00:59:34.000000000 +0200 +++ imageworks-OpenColorIO-2b12063/src/jniglue/CMakeLists.txt 2013-11-07 20:11:29.503699385 +0100 @@ -71,7 +71,7 @@ add_custom_command(OUTPUT ${JNIOCIO_HEADERS} COMMAND cmake -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/org/OpenColorIO COMMAND ${Java_JAVAC_EXECUTABLE} -cp ${CMAKE_CURRENT_BINARY_DIR} -d ${CMAKE_CURRENT_BINARY_DIR} ${JNIOCIO_JAVAS} - COMMAND ${Java_JAVAH_EXECUTABLE} -jni -force ${JNIOCIO_CLASSES} + COMMAND ${Java_JAVAH_EXECUTABLE} -jni -force -classpath ${CMAKE_CURRENT_BINARY_DIR} ${JNIOCIO_CLASSES} COMMAND ${Java_JAR_EXECUTABLE} vcfm ${JNIOCIO_JAR} Manifest.txt org IMPLICIT_DEPENDS ${JNIOCIO_JAVAS} COMMENT "Compiling .java files, packaged .jar and creating jni C headers")