From 9700c47cd44ba51b55c593d42a21c0b110ed3deb Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 16 Sep 2019 11:03:32 -0400 Subject: [PATCH] Add support for adoptopenjdk12 Signed-off-by: Curtis Rueden --- setup.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/setup.py b/setup.py index 29e777e..679447d 100644 --- a/setup.py +++ b/setup.py @@ -137,6 +137,12 @@ elif PLATFORM == 'darwin': # In that case, the Java version is very likely >=9. # So we need to modify the `libjvm.so` path. LIB_LOCATION = 'lib/jli/libjli.dylib' + FULL_LIB_LOCATION = join(FRAMEWORK, LIB_LOCATION) + + if not exists(FULL_LIB_LOCATION): + # adoptopenjdk12 doesn't have the jli subfolder either + LIB_LOCATION = 'lib/libjli.dylib' + FULL_LIB_LOCATION = join(FRAMEWORK, LIB_LOCATION) INCLUDE_DIRS = [ '{0}/include'.format(FRAMEWORK),