diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2018-08-31 03:18:25 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2018-08-31 03:18:25 (GMT) |
| commit | 031088fc121870d04c736b5b06b86246544fb97f (patch) | |
| tree | 70fd5c750b5c9e0113249833946cf5a655a3bdce /java | |
| parent | e12f770b3e23014ff11151787f75abbdfa8b4579 (diff) | |
| parent | 67220d101fbea90eab1c5bda0af531d39829c170 (diff) | |
| download | hdf5-031088fc121870d04c736b5b06b86246544fb97f.zip hdf5-031088fc121870d04c736b5b06b86246544fb97f.tar.gz hdf5-031088fc121870d04c736b5b06b86246544fb97f.tar.bz2 | |
Merge pull request #1230 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '67220d101fbea90eab1c5bda0af531d39829c170':
Java must use shared libs to allow dlopen calls
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/jni/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/jni/CMakeLists.txt b/java/src/jni/CMakeLists.txt index a0228e1..009cdc9 100644 --- a/java/src/jni/CMakeLists.txt +++ b/java/src/jni/CMakeLists.txt @@ -50,7 +50,7 @@ set (CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) add_library (${HDF5_JAVA_JNI_LIB_TARGET} SHARED ${HDF5_JAVA_JNI_CSRCS} ${HDF5_JAVA_JNI_CHDRS}) target_include_directories(${HDF5_JAVA_JNI_LIB_TARGET} PRIVATE ${HDF5_BINARY_DIR} ${HDF5_JAVA_JNI_SOURCE_DIR}) TARGET_C_PROPERTIES (${HDF5_JAVA_JNI_LIB_TARGET} SHARED) -target_link_libraries (${HDF5_JAVA_JNI_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET}) +target_link_libraries (${HDF5_JAVA_JNI_LIB_TARGET} PUBLIC ${HDF5_LIBSH_TARGET}) set_target_properties (${HDF5_JAVA_JNI_LIB_TARGET} PROPERTIES FOLDER libraries/jni) SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_JAVA_JNI_LIB_TARGET}") H5_SET_LIB_OPTIONS (${HDF5_JAVA_JNI_LIB_TARGET} ${HDF5_JAVA_JNI_LIB_NAME} SHARED "JAVA") |