Add support for adoptopenjdk12

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
This commit is contained in:
Dan 2019-09-16 11:03:32 -04:00 committed by Curtis Rueden
parent ad5635686c
commit 9700c47cd4
1 changed files with 6 additions and 0 deletions

View File

@ -137,6 +137,12 @@ elif PLATFORM == 'darwin':
# In that case, the Java version is very likely >=9. # In that case, the Java version is very likely >=9.
# So we need to modify the `libjvm.so` path. # So we need to modify the `libjvm.so` path.
LIB_LOCATION = 'lib/jli/libjli.dylib' 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 = [ INCLUDE_DIRS = [
'{0}/include'.format(FRAMEWORK), '{0}/include'.format(FRAMEWORK),