diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-04-11 21:00:25 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-04-11 21:00:25 (GMT) |
| commit | a80fc54b087ae486710cecea2105ac4554f2e839 (patch) | |
| tree | d39b5466089be112fead20e08511e3a5c4d49d71 /java/src | |
| parent | 744d2d3d8c5660dd9758c74cf9d3c76bc172cdf3 (diff) | |
| parent | c8974b8a9e49aba96c93f9efa8977a5c57a35a07 (diff) | |
| download | hdf5-a80fc54b087ae486710cecea2105ac4554f2e839.zip hdf5-a80fc54b087ae486710cecea2105ac4554f2e839.tar.gz hdf5-a80fc54b087ae486710cecea2105ac4554f2e839.tar.bz2 | |
Merge pull request #1025 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'c8974b8a9e49aba96c93f9efa8977a5c57a35a07':
Whitespace and test reclassify merge from develop
HDFFV-10444 fix so numbers and merge java test changes
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>") |