summaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2018-01-22 17:22:27 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2018-01-22 17:22:27 (GMT)
commit233afe3b6f77a487baed555569ee0524ca7a4d24 (patch)
treebd247af8868be2a861374ce3a3d670547c62548f /java/src
parenta3afda29f501e166d4d40ef1ad1fd320dbfe1974 (diff)
downloadhdf5-233afe3b6f77a487baed555569ee0524ca7a4d24.zip
hdf5-233afe3b6f77a487baed555569ee0524ca7a4d24.tar.gz
hdf5-233afe3b6f77a487baed555569ee0524ca7a4d24.tar.bz2
HDFFV-10385,10392,10393 merge from develop
Diffstat (limited to 'java/src')
-rw-r--r--java/src/jni/CMakeLists.txt4
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