summaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2018-02-02 20:12:21 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2018-02-02 20:12:21 (GMT)
commit785b4ad2d41a1976c9e68b95dc72ea2f0d82342f (patch)
treec6b9b50a5338c6c0cfad2e64944caf61b59fae1a /java/src
parent45aabcc9513c3d09f15293ed37ed92763910cb0d (diff)
parentad89b8325555ffd7ea27baef61c506a81dc80a96 (diff)
downloadhdf5-785b4ad2d41a1976c9e68b95dc72ea2f0d82342f.zip
hdf5-785b4ad2d41a1976c9e68b95dc72ea2f0d82342f.tar.gz
hdf5-785b4ad2d41a1976c9e68b95dc72ea2f0d82342f.tar.bz2
Merge pull request #885 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'ad89b8325555ffd7ea27baef61c506a81dc80a96': Add note for HDFFV-10398 HDFFV-10398 merge from develop improve CMake code
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)