diff options
| author | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2018-01-23 22:00:31 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2018-01-23 22:00:31 (GMT) |
| commit | be77e5935356f13daef03af1562476b516131c18 (patch) | |
| tree | 40103d28749e572a7f84bbb0a72ba27d51c9e3b6 /java/src | |
| parent | 8427eefafe7af83dbc133975c3ac2368cf1b08d6 (diff) | |
| parent | c5e311897444abe43b9dafcf0225e9fb880a3e2b (diff) | |
| download | hdf5-be77e5935356f13daef03af1562476b516131c18.zip hdf5-be77e5935356f13daef03af1562476b516131c18.tar.gz hdf5-be77e5935356f13daef03af1562476b516131c18.tar.bz2 | |
Merge branch 'develop' into bugfix/version_bounds
Keep the branch up-to-date.
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/jni/CMakeLists.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/java/src/jni/CMakeLists.txt b/java/src/jni/CMakeLists.txt index 90343b2..ea9665b 100644 --- a/java/src/jni/CMakeLists.txt +++ b/java/src/jni/CMakeLists.txt @@ -57,9 +57,7 @@ SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF H5_SET_LIB_OPTIONS (${HDF5_JAVA_JNI_LIB_TARGET} ${HDF5_JAVA_JNI_LIB_NAME} SHARED ${HDF5_JAVA_PACKAGE_SOVERSION}) if (WIN32) get_filename_component (HDF5_JAVA_JNI_DLL_NAME ${HDF5_JAVA_JNI_LIB_TARGET} NAME_WE) - if (HDF5_BUILD_TYPE MATCHES Debug) - set (HDF5_JAVA_JNI_DLL_NAME "${HDF5_JAVA_JNI_DLL_NAME}_D") - endif () + set (HDF5_JAVA_JNI_DLL_NAME "${HDF5_JAVA_JNI_DLL_NAME}$<$<CONFIG:Debug>:_D>") # message (STATUS "HDF5_JAVA_JNI_DLL_NAME: ${HDF5_JAVA_JNI_DLL_NAME}") if (BUILD_TESTING) add_custom_target (HDF5_JAVA_JNI-Test-Copy ALL |