diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-02-02 20:12:12 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-02-02 20:12:12 (GMT) |
| commit | ffa2dec25d69ba2d530c5eb60e07d6618562017a (patch) | |
| tree | 777582f6bb0c4f7fea232e0410db2b99db0ef713 /java/src | |
| parent | 116c40450c4c559c3713044dce590100273a4fa5 (diff) | |
| parent | b57c5490e0901c451a77a356ceb1f6071dc89123 (diff) | |
| download | hdf5-ffa2dec25d69ba2d530c5eb60e07d6618562017a.zip hdf5-ffa2dec25d69ba2d530c5eb60e07d6618562017a.tar.gz hdf5-ffa2dec25d69ba2d530c5eb60e07d6618562017a.tar.bz2 | |
Merge pull request #884 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'b57c5490e0901c451a77a356ceb1f6071dc89123':
JHDFFV-10398 add note
HDFFV-10398 fix detection of repeat checks
HDFFV-10398 add support for Emscriptem build system
HDFFV-10398 avoid sanitizer failures
HDFFV-10398 - avoid ubsan crashes
HDFFV-10398 msvc: use /W0 rather than /w
HDFFV-10398 Suppress VS 2015 assertion failure popup during try_run
HDFFV-10398 use the target name for custom commands
HDFFV-10398 use the simpler add_subdirectory signature
HDFFV-10398 Honor CMAKE_MODULE_PATH when including check modules
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | java/src/hdf/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/java/src/CMakeLists.txt b/java/src/CMakeLists.txt index 3f93f39..9bdab4b 100644 --- a/java/src/CMakeLists.txt +++ b/java/src/CMakeLists.txt @@ -4,5 +4,5 @@ PROJECT ( HDF5_JAVA_SRC C Java ) #----------------------------------------------------------------------------- # Traverse source subdirectory #----------------------------------------------------------------------------- -add_subdirectory (${HDF5_JAVA_SRC_SOURCE_DIR}/jni ${HDF5_JAVA_SRC_BINARY_DIR}/jni) -add_subdirectory (${HDF5_JAVA_SRC_SOURCE_DIR}/hdf ${HDF5_JAVA_SRC_BINARY_DIR}/hdf) +add_subdirectory (jni) +add_subdirectory (hdf) diff --git a/java/src/hdf/CMakeLists.txt b/java/src/hdf/CMakeLists.txt index 84bda53..649f7d0 100644 --- a/java/src/hdf/CMakeLists.txt +++ b/java/src/hdf/CMakeLists.txt @@ -1,4 +1,4 @@ cmake_minimum_required (VERSION 3.2.2) PROJECT (HDF5_JAVA_HDF) -add_subdirectory (${HDF5_JAVA_HDF_SOURCE_DIR}/hdf5lib hdf5lib) +add_subdirectory (hdf5lib) |