diff options
| author | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2018-01-12 23:51:42 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2018-01-12 23:51:42 (GMT) |
| commit | 120d02657b4c7dff45dd8e83b8f1aaa0c7e51373 (patch) | |
| tree | 19935f8689df3319e6661f8b393d6eda16cefd45 /java/src/jni/CMakeLists.txt | |
| parent | 37318f109a294bb47e5040be5888963967c1badc (diff) | |
| parent | aef900c6741aea851b218169648185b1c8e5e435 (diff) | |
| download | hdf5-120d02657b4c7dff45dd8e83b8f1aaa0c7e51373.zip hdf5-120d02657b4c7dff45dd8e83b8f1aaa0c7e51373.tar.gz hdf5-120d02657b4c7dff45dd8e83b8f1aaa0c7e51373.tar.bz2 | |
Merge branch develop into bugfix/version_bounds
Diffstat (limited to 'java/src/jni/CMakeLists.txt')
| -rw-r--r-- | java/src/jni/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/jni/CMakeLists.txt b/java/src/jni/CMakeLists.txt index 9e6c099..90343b2 100644 --- a/java/src/jni/CMakeLists.txt +++ b/java/src/jni/CMakeLists.txt @@ -51,13 +51,13 @@ set (CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) ########### JNI libraries always must be built shared ############### add_library (${HDF5_JAVA_JNI_LIB_TARGET} SHARED ${HDF5_JAVA_JNI_CSRCS} ${HDF5_JAVA_JNI_CHDRS}) TARGET_C_PROPERTIES (${HDF5_JAVA_JNI_LIB_TARGET} SHARED " " " ") -target_link_libraries (${HDF5_JAVA_JNI_LIB_TARGET} ${HDF5_LIB_TARGET}) +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}) if (WIN32) get_filename_component (HDF5_JAVA_JNI_DLL_NAME ${HDF5_JAVA_JNI_LIB_TARGET} NAME_WE) - if (CMAKE_BUILD_TYPE MATCHES Debug) + if (HDF5_BUILD_TYPE MATCHES Debug) set (HDF5_JAVA_JNI_DLL_NAME "${HDF5_JAVA_JNI_DLL_NAME}_D") endif () # message (STATUS "HDF5_JAVA_JNI_DLL_NAME: ${HDF5_JAVA_JNI_DLL_NAME}") |