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 | |
| 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')
| -rw-r--r-- | java/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | java/examples/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | java/src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | java/src/hdf/CMakeLists.txt | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt index 68860be..9a5692f 100644 --- a/java/CMakeLists.txt +++ b/java/CMakeLists.txt @@ -36,20 +36,20 @@ set (CMAKE_JAVA_INCLUDE_PATH "") #----------------------------------------------------------------------------- # Traverse source subdirectory #----------------------------------------------------------------------------- -add_subdirectory (${HDF5_JAVA_SOURCE_DIR}/src ${HDF5_JAVA_BINARY_DIR}/src) +add_subdirectory (src) #----------------------------------------------------------------------------- # Build the Java Examples #----------------------------------------------------------------------------- if (HDF5_BUILD_EXAMPLES) - add_subdirectory (${HDF5_JAVA_SOURCE_DIR}/examples ${HDF5_JAVA_BINARY_DIR}/examples) + add_subdirectory (examples) endif () #----------------------------------------------------------------------------- # Testing #----------------------------------------------------------------------------- if (BUILD_TESTING) - add_subdirectory (${HDF5_JAVA_SOURCE_DIR}/test ${HDF5_JAVA_BINARY_DIR}/test) + add_subdirectory (test) endif () #----------------------------------------------------------------------------- diff --git a/java/examples/CMakeLists.txt b/java/examples/CMakeLists.txt index a1a7483..3073918 100644 --- a/java/examples/CMakeLists.txt +++ b/java/examples/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required (VERSION 3.2.2) PROJECT (HDFJAVA_EXAMPLES) -add_subdirectory (${HDFJAVA_EXAMPLES_SOURCE_DIR}/datasets datasets) -add_subdirectory (${HDFJAVA_EXAMPLES_SOURCE_DIR}/datatypes datatypes) -add_subdirectory (${HDFJAVA_EXAMPLES_SOURCE_DIR}/groups groups) -add_subdirectory (${HDFJAVA_EXAMPLES_SOURCE_DIR}/intro intro) +add_subdirectory (datasets) +add_subdirectory (datatypes) +add_subdirectory (groups) +add_subdirectory (intro) 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) |