diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-05-08 21:50:29 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-05-08 21:50:29 (GMT) |
| commit | 7aeebec9463d18c3040ba7fa37464c00b64ab75e (patch) | |
| tree | 0a7f00ec6357ce94c19f11c34c02d18b4bb01fe6 /java | |
| parent | 0cc480d952e2e215f006fc172485fcbabc0f599f (diff) | |
| parent | 0344785872020c4ef1de90cf57f286f1cf4ad2fc (diff) | |
| download | hdf5-7aeebec9463d18c3040ba7fa37464c00b64ab75e.zip hdf5-7aeebec9463d18c3040ba7fa37464c00b64ab75e.tar.gz hdf5-7aeebec9463d18c3040ba7fa37464c00b64ab75e.tar.bz2 | |
Merge pull request #1047 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '0344785872020c4ef1de90cf57f286f1cf4ad2fc': (28 commits)
Text cleanup
Correct sentence punctuation.
Add release note.
Use set_property for MT flag
Correct command usage
Remove APPEND
Fix typo
Add missing test lib
add missing folder to path
Fix another command revert
Missed a command revert
Revert to old style for LINK_FLAGS gen expr not working
LINK_FLAGS must be separate property sets
Fix link flags syntax
Revert refactor link flags
refactor link flags to interface
Refactor link flags
Fix defs and additional MSVC items
TRILABS-19 fix syntax for windows
TRILABS-19 Link flags need - character
...
Diffstat (limited to 'java')
| -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 dc9cc01..a0228e1 100644 --- a/java/src/jni/CMakeLists.txt +++ b/java/src/jni/CMakeLists.txt @@ -49,7 +49,7 @@ 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_include_directories(${HDF5_JAVA_JNI_LIB_TARGET} PRIVATE ${HDF5_BINARY_DIR} ${HDF5_JAVA_JNI_SOURCE_DIR}) -TARGET_C_PROPERTIES (${HDF5_JAVA_JNI_LIB_TARGET} SHARED " " " ") +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}") |