mac os x java 1.8

Author: cristian-anita

common.pri

@@ -1180,16 +1180,16 @@ unix {
 			#CONFIG += cppdevtk_mac_enable_javavm_framework
 
 			cppdevtk_mac_enable_javavm_framework {
-				INCLUDEPATH *= /System/Library/Frameworks/JavaVM.framework/Headers
+				INCLUDEPATH = /System/Library/Frameworks/JavaVM.framework/Headers $${INCLUDEPATH}
 			}
 			else {
 				CPPDEVTK_JAVA_HOME = /Library/Java/Home
 
-				INCLUDEPATH *= $${CPPDEVTK_JAVA_HOME}/include
-				INCLUDEPATH *= $${CPPDEVTK_JAVA_HOME}/include/darwin
+				INCLUDEPATH = $${CPPDEVTK_JAVA_HOME}/include $${INCLUDEPATH}
+				INCLUDEPATH = $${CPPDEVTK_JAVA_HOME}/include/darwin $${INCLUDEPATH}
 
 				CPPDEVTK_JAVA_LIB_DIR = $${CPPDEVTK_JAVA_HOME}/jre/lib/server
-				LIBS *= -L$${CPPDEVTK_JAVA_LIB_DIR}
+				LIBS = -L$${CPPDEVTK_JAVA_LIB_DIR} $${LIBS}
 				!static_and_shared|build_pass {
 					CONFIG(shared, static|shared) {
 						!contains(QMAKE_RPATHDIR, $${CPPDEVTK_JAVA_LIB_DIR}) {

doc/cppdevtk_api.chm

@@ -27,11 +27,17 @@
 #include <jni.h>
 
 
-// Minimum requirement: 1.6 (CentOS 6.0)
-#ifndef JNI_VERSION_1_6
-#	error("JNI >= 1.6 required")
+#if (CPPDEVTK_PLATFORM_MACOSX)
+#	ifndef JNI_VERSION_1_8
+#		error "JNI >= 1.8 required"
+#	endif
+#	define CPPDEVTK_JNI_VERSION JNI_VERSION_1_8
+#else
+#	ifndef JNI_VERSION_1_6
+#		error "JNI >= 1.6 required"
+#	endif
+#	define CPPDEVTK_JNI_VERSION JNI_VERSION_1_6
 #endif
-#define CPPDEVTK_JNI_VERSION JNI_VERSION_1_6
 
 
 #ifdef CPPDEVTK_SHARED

include/cppdevtk/jni/config.hpp

@@ -80,6 +80,12 @@ INSTALLS += target
 			}
 			else {
 				LIBS *= -ljvm
+				
+				!static_and_shared|build_pass {
+					CONFIG(shared, static|shared) {
+						QMAKE_POST_LINK += install_name_tool -add_rpath $${CPPDEVTK_JAVA_LIB_DIR}/ $${DESTDIR}/lib$${TARGET}.$${CPPDEVTK_LIB_EXT}
+					}
+				}
 			}
 		}
 		else {