summaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2018-02-01 16:06:06 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2018-02-01 16:06:06 (GMT)
commit66e5f283c554f6ae84fbfafc6a8476a35dfcf3d0 (patch)
tree509ec74601358f6715dd2e18f4f9e8aef22e71c5 /java/src
parent4c0440e61f5bc57f12406b523e9545980e9e6b70 (diff)
parentb86cc6ea841c24a0513c95b8e6d9aaac209c0fb8 (diff)
downloadhdf5-66e5f283c554f6ae84fbfafc6a8476a35dfcf3d0.zip
hdf5-66e5f283c554f6ae84fbfafc6a8476a35dfcf3d0.tar.gz
hdf5-66e5f283c554f6ae84fbfafc6a8476a35dfcf3d0.tar.bz2
Merge branch 'bugfix/version_bounds' of https://bitbucket.hdfgroup.org/scm/~bmribler/version_bounds_bmr into bugfix/version_bounds
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