philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFFV-9739 and cmake improvements merge from develop

Browse Source
This commit is contained in:
Allen Byrne
2018-05-22 10:23:16 -05:00
parent e1e63edd35
commit e96ef71034
150 changed files with 3755 additions and 3354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/cmake/UseJava.cmake
View File

@@ -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})