diff options
| author | mattjala <124107509+mattjala@users.noreply.github.com> | 2023-06-15 20:53:19 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-15 20:53:19 (GMT) |
| commit | c2e3e9f63a1872a8f27aac18f0ff72405746b8ce (patch) | |
| tree | f19b3b1b36a7531f3ec54c112ff775dd7fbda465 /bin | |
| parent | d987620daeb226f3e2c89a48383f52cef83a94c6 (diff) | |
| download | hdf5-c2e3e9f63a1872a8f27aac18f0ff72405746b8ce.zip hdf5-c2e3e9f63a1872a8f27aac18f0ff72405746b8ce.tar.gz hdf5-c2e3e9f63a1872a8f27aac18f0ff72405746b8ce.tar.bz2 | |
Add java options to build scripts (#3136)
Previously, cmakehdf5 turned on compiling of the java interface
by default due to a value set in cacheinit.cmake.
Now, consistent with how Fortran and CPP interfaces are handled,
the script overwrites this default value to disable the libraries,
fixing #2958.
I also implemented the --enable-java/--disable java options for
cmakehdf5, and -java for buildhdf5.
Allen said these scripts should mention that
compilers are to be specified in environment variables, but missing
compilers causes errors at the CMake level, and
CMake's error messages are already pretty informative (See the one
in #2958 about JAVA_COMPILER).
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/buildhdf5 | 6 | ||||
| -rwxr-xr-x | bin/cmakehdf5 | 11 |
2 files changed, 16 insertions, 1 deletions
diff --git a/bin/buildhdf5 b/bin/buildhdf5 index 4c84884..a2a13cb 100755 --- a/bin/buildhdf5 +++ b/bin/buildhdf5 @@ -25,7 +25,7 @@ can continue from a previous build. Command Syntax ============== -buildhdf5 [-config] [-szlib] [-help] [-n] [-srcdir dir] [-fortran] [-cxx] [-pp] config-arguments ... +buildhdf5 [-config] [-szlib] [-help] [-n] [-srcdir dir] [-fortran] [-cxx] [-java] [-pp] config-arguments ... -config: run configure only. [default to do build too] -szlib: configure in the szlib option -help: show this help page @@ -35,6 +35,7 @@ buildhdf5 [-config] [-szlib] [-help] [-n] [-srcdir dir] [-fortran] [-cxx] [-pp] which will be passed to configure] -fortran: add --enable-fortran -cxx: add --enable-cxx + -java: add --enable-java -pp: add --enable-parallel all other arguments are passed to configure @@ -251,6 +252,9 @@ while [ $# -gt 0 ]; do -cxx) CONFIG_OP="$CONFIG_OP --enable-cxx" ;; + -java) + CONFIG_OP="$CONFIG_OP --enable-java" + ;; -fortran) CONFIG_OP="$CONFIG_OP --enable-fortran" ;; diff --git a/bin/cmakehdf5 b/bin/cmakehdf5 index e59c772..f17b9c4 100755 --- a/bin/cmakehdf5 +++ b/bin/cmakehdf5 @@ -45,6 +45,7 @@ fi cacheinit=$srcdir/config/cmake/cacheinit.cmake build_cpp_lib=-DHDF5_BUILD_CPP_LIB:BOOL=OFF # C++ interface default off build_fortran=-DHDF5_BUILD_FORTRAN:BOOL=OFF # Fortran interface default off +build_java=-DHDF5_BUILD_JAVA:BOOL=OFF # Java interface default off build_hl_lib=-DHDF5_BUILD_HL_LIB:BOOL=ON # High Level interface default on build_threadsafe=-DHDF5_ENABLE_THREADSAFE:BOOL=OFF # Threadsafe feature default off build_testing=-DBUILD_TESTING:BOOL=ON # Build tests default on @@ -82,6 +83,8 @@ Usage: $progname [<options>] enable or disable fortran API. Default is off. --enable-cxx | --disable-cxx: enable or disable c++ API. Default is off. + --enable-java | --disable-java: + enable or disable Java API. Default is off. --enable-hl | --disable-hl: enable or disable high level API. Default is on. --enable-threadsafe | --disable-threadsafe: @@ -210,6 +213,7 @@ fi # XXX can be: # fortran Fortran interface # cxx C++ interface +# java Java interface # hl Highlevel interface # testing Build tests # tools Build tools @@ -227,6 +231,12 @@ while [ $# -gt 0 ]; do --disable-cxx) build_cpp_lib=-DHDF5_BUILD_CPP_LIB:BOOL=OFF ;; + --enable-java) + build_java=-DHDF5_BUILD_JAVA:BOOL=ON + ;; + --disable-java) + build_java=-DHDF5_BUILD_JAVA:BOOL=OFF + ;; --enable-hl) build_hl_lib=-DHDF5_BUILD_HL_LIB:BOOL=ON ;; @@ -345,6 +355,7 @@ STEP "Configure..." \ -C $cacheinit \ $build_cpp_lib \ $build_fortran \ + $build_java \ $build_hl_lib \ $build_threadsafe \ $shared_lib \ |