diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2016-04-19 19:45:07 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2016-04-19 19:45:07 (GMT) |
| commit | b38491a7c2580661ea7117b093799d49c93e34c7 (patch) | |
| tree | bd8ea5a2ec4312fb0ab5e15e82babb04cecc7eaa /java/src | |
| parent | 32ff3431c7ebc3be08659008f27008e470bf0c8d (diff) | |
| download | hdf5-b38491a7c2580661ea7117b093799d49c93e34c7.zip hdf5-b38491a7c2580661ea7117b093799d49c93e34c7.tar.gz hdf5-b38491a7c2580661ea7117b093799d49c93e34c7.tar.bz2 | |
[svn-r29748] HDFFV-9770: Fix h5watch and CMake for HL.
Convert CMake sources tags from _SRCS to _SOURCES(closer match to Makefile).
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/hdf/hdf5lib/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/src/hdf/hdf5lib/CMakeLists.txt b/java/src/hdf/hdf5lib/CMakeLists.txt index 3f70bce..0ddf88c 100644 --- a/java/src/hdf/hdf5lib/CMakeLists.txt +++ b/java/src/hdf/hdf5lib/CMakeLists.txt @@ -14,7 +14,7 @@ SET_GLOBAL_VARIABLE (HDF5_JAVA_SOURCE_PACKAGES "${HDFJAVA_SOURCE_PACKAGES};hdf.hdf5lib.callbacks;hdf.hdf5lib.exceptions;hdf.hdf5lib.structs;hdf.hdf5lib" ) -set (HDF5_JAVA_HDF_HDF5_CALLBACKS_SRCS +set (HDF5_JAVA_HDF_HDF5_CALLBACKS_SOURCES callbacks/H5A_iterate_cb.java callbacks/H5A_iterate_t.java callbacks/H5D_append_cb.java @@ -45,7 +45,7 @@ set (HDF5_JAVA_HDF_HDF5_CALLBACKS_SRCS callbacks/Callbacks.java ) -set (HDF5_JAVA_HDF_HDF5_EXCEPTIONS_SRCS +set (HDF5_JAVA_HDF_HDF5_EXCEPTIONS_SOURCES exceptions/HDF5Exception.java exceptions/HDF5AtomException.java exceptions/HDF5AttributeException.java @@ -72,7 +72,7 @@ set (HDF5_JAVA_HDF_HDF5_EXCEPTIONS_SRCS exceptions/HDF5SymbolTableException.java ) -set (HDF5_JAVA_HDF_HDF5_STRUCTS_SRCS +set (HDF5_JAVA_HDF_HDF5_STRUCTS_SOURCES structs/H5_ih_info_t.java structs/H5A_info_t.java structs/H5AC_cache_config_t.java @@ -84,7 +84,7 @@ set (HDF5_JAVA_HDF_HDF5_STRUCTS_SRCS structs/H5O_info_t.java ) -set (HDF5_JAVA_HDF_HDF5_SRCS +set (HDF5_JAVA_HDF_HDF5_SOURCES HDFArray.java HDF5Constants.java HDF5GroupInfo.java @@ -101,7 +101,7 @@ file (WRITE ${PROJECT_BINARY_DIR}/Manifest.txt set (CMAKE_JAVA_INCLUDE_PATH "${HDF5_JAVA_LOGGING_JAR}") -add_jar (${HDF5_JAVA_HDF5_LIB_TARGET} OUTPUT_NAME "${HDF5_JAVA_HDF5_LIB_TARGET}-${HDF5_PACKAGE_VERSION}" OUTPUT_DIR ${CMAKE_JAVA_TARGET_OUTPUT_DIR} MANIFEST ${PROJECT_BINARY_DIR}/Manifest.txt ${HDF5_JAVA_HDF_HDF5_CALLBACKS_SRCS} ${HDF5_JAVA_HDF_HDF5_EXCEPTIONS_SRCS} ${HDF5_JAVA_HDF_HDF5_STRUCTS_SRCS} ${HDF5_JAVA_HDF_HDF5_SRCS}) +add_jar (${HDF5_JAVA_HDF5_LIB_TARGET} OUTPUT_NAME "${HDF5_JAVA_HDF5_LIB_TARGET}-${HDF5_PACKAGE_VERSION}" OUTPUT_DIR ${CMAKE_JAVA_TARGET_OUTPUT_DIR} MANIFEST ${PROJECT_BINARY_DIR}/Manifest.txt ${HDF5_JAVA_HDF_HDF5_CALLBACKS_SOURCES} ${HDF5_JAVA_HDF_HDF5_EXCEPTIONS_SOURCES} ${HDF5_JAVA_HDF_HDF5_STRUCTS_SOURCES} ${HDF5_JAVA_HDF_HDF5_SOURCES}) install_jar (${HDF5_JAVA_HDF5_LIB_TARGET} LIBRARY DESTINATION ${HDF5_INSTALL_JAR_DIR} COMPONENT libraries) #if (NOT WIN32) # install_jni_symlink (${HDF5_JAVA_HDF5_LIB_TARGET} ${HDF5_INSTALL_JAR_DIR} libraries) @@ -115,7 +115,7 @@ add_dependencies (${HDF5_JAVA_HDF5_LIB_TARGET} ${HDF5_JAVA_JNI_LIB_TARGET}) set_target_properties (${HDF5_JAVA_HDF5_LIB_TARGET} PROPERTIES FOLDER libraries/java) create_javadoc(hdf5_java_doc - FILES ${HDF5_JAVA_HDF_HDF5_CALLBACKS_SRCS} ${HDF5_JAVA_HDF_HDF5_EXCEPTIONS_SRCS} ${HDF5_JAVA_HDF_HDF5_STRUCTS_SRCS} ${HDF5_JAVA_HDF_HDF5_SRCS} + FILES ${HDF5_JAVA_HDF_HDF5_CALLBACKS_SOURCES} ${HDF5_JAVA_HDF_HDF5_EXCEPTIONS_SOURCES} ${HDF5_JAVA_HDF_HDF5_STRUCTS_SOURCES} ${HDF5_JAVA_HDF_HDF5_SOURCES} OVERVIEW ${HDF5_JAVA_HDF5_SRC_DIR}/overview.html CLASSPATH ${CMAKE_JAVA_INCLUDE_PATH} WINDOWTITLE "HDF5 Java" |