diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-04-11 20:09:32 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-04-11 20:09:32 (GMT) |
| commit | 9cd4e23ce772f5f86cd8dfc4b0e2096b2875fd41 (patch) | |
| tree | 8efa7edcc0c0df0b6d2686da34f0fd66e28f60c5 /java/src | |
| parent | f03522c4d79acd1d1829c0676c59c887fed27cb5 (diff) | |
| parent | 34e3e3ef17f29b721780941866a3ad4c261b7c05 (diff) | |
| download | hdf5-9cd4e23ce772f5f86cd8dfc4b0e2096b2875fd41.zip hdf5-9cd4e23ce772f5f86cd8dfc4b0e2096b2875fd41.tar.gz hdf5-9cd4e23ce772f5f86cd8dfc4b0e2096b2875fd41.tar.bz2 | |
Merge pull request #1024 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '34e3e3ef17f29b721780941866a3ad4c261b7c05':
Whitespace changes
Whitespace and test reclassify
Move two more functions from unit tests
Reorder of tests for debug APIs option
HDFFV-10444 fix soversion numbers for libraries
Fix Java test for DEBUG_APIS
Use var instead of absolute number
Diffstat (limited to 'java/src')
| -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 96e7035..21e9d22 100644 --- a/java/src/jni/CMakeLists.txt +++ b/java/src/jni/CMakeLists.txt @@ -54,7 +54,7 @@ TARGET_C_PROPERTIES (${HDF5_JAVA_JNI_LIB_TARGET} SHARED " " " ") target_link_libraries (${HDF5_JAVA_JNI_LIB_TARGET} PUBLIC ${HDF5_LIB_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 ${HDF5_JAVA_PACKAGE_SOVERSION}) +H5_SET_LIB_OPTIONS (${HDF5_JAVA_JNI_LIB_TARGET} ${HDF5_JAVA_JNI_LIB_NAME} SHARED "JAVA") if (WIN32) get_filename_component (HDF5_JAVA_JNI_DLL_NAME ${HDF5_JAVA_JNI_LIB_TARGET} NAME_WE) set (HDF5_JAVA_JNI_DLL_NAME "${HDF5_JAVA_JNI_DLL_NAME}$<$<CONFIG:Debug>:_D>") |