summaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorM. Scot Breitenfeld <brtnfld@hdfgroup.org>2018-02-20 20:12:51 (GMT)
committerM. Scot Breitenfeld <brtnfld@hdfgroup.org>2018-02-20 20:12:51 (GMT)
commitec361559b3a78126e70ec4abd74a98d5faff53f0 (patch)
tree828740a9fc0139e8dc1ac405a5b0e62e28188321 /java/src
parent65c670d39cb5466185f23e6a39a743f02e4f4ae8 (diff)
parent9f2802f23cad8dd16f21b85c0dd9c97008a51f76 (diff)
downloadhdf5-ec361559b3a78126e70ec4abd74a98d5faff53f0.zip
hdf5-ec361559b3a78126e70ec4abd74a98d5faff53f0.tar.gz
hdf5-ec361559b3a78126e70ec4abd74a98d5faff53f0.tar.bz2
Merge branch 'develop' into avoid_trunc_beta
Diffstat (limited to 'java/src')
-rw-r--r--java/src/CMakeLists.txt4
-rw-r--r--java/src/hdf/CMakeLists.txt2
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)