diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-05-22 16:36:23 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-05-22 16:36:23 (GMT) |
| commit | 73a21358a99357e1b5728b5732f951c5018ba548 (patch) | |
| tree | 06e1901441210696c78547b7105a02f90a833bc2 /config/cmake/UseJava.cmake | |
| parent | 525b9f40e5c112b777a28d207ccb6fd454f156fc (diff) | |
| parent | ab8a7235c3892ac0427f37661aa0d821993dae9b (diff) | |
| download | hdf5-73a21358a99357e1b5728b5732f951c5018ba548.zip hdf5-73a21358a99357e1b5728b5732f951c5018ba548.tar.gz hdf5-73a21358a99357e1b5728b5732f951c5018ba548.tar.bz2 | |
Merge pull request #1067 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'ab8a7235c3892ac0427f37661aa0d821993dae9b':
HDFFV-10473 add note for attribute fix
Correct attribute location
HDFFV-9739 and cmake improvements merge from develop
Update Windows test machines
Fix soversion
Diffstat (limited to 'config/cmake/UseJava.cmake')
| -rw-r--r-- | config/cmake/UseJava.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/config/cmake/UseJava.cmake b/config/cmake/UseJava.cmake index 60b1758..10ffe47 100644 --- a/config/cmake/UseJava.cmake +++ b/config/cmake/UseJava.cmake @@ -794,9 +794,11 @@ function(add_jar _TARGET_NAME) if (_GENERATE_NATIVE_HEADERS) # create an INTERFACE library encapsulating include directory for generated headers add_library (${_GENERATE_NATIVE_HEADERS_TARGET} INTERFACE) - target_include_directories (${_GENERATE_NATIVE_HEADERS_TARGET} INTERFACE - "${_GENERATE_NATIVE_HEADERS_OUTPUT_DIR}" - ${JNI_INCLUDE_DIRS}) + target_include_directories (${_GENERATE_NATIVE_HEADERS_TARGET} + INTERFACE + "${_GENERATE_NATIVE_HEADERS_OUTPUT_DIR}" + ${JNI_INCLUDE_DIRS} + ) # this INTERFACE library depends on jar generation add_dependencies (${_GENERATE_NATIVE_HEADERS_TARGET} ${_TARGET_NAME}) |