diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2015-04-03 00:16:30 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2015-04-03 00:16:30 (GMT) |
| commit | db447ec89ab9968af637941a146129f437ba8b98 (patch) | |
| tree | 005e13d8088945d781a115a2ec32315f1ab48755 | |
| parent | f39f4125630fb774baf5023a0e8aa9235308a97e (diff) | |
| download | hdf5-db447ec89ab9968af637941a146129f437ba8b98.zip hdf5-db447ec89ab9968af637941a146129f437ba8b98.tar.gz hdf5-db447ec89ab9968af637941a146129f437ba8b98.tar.bz2 | |
[svn-r26713] Merge r26712 from trunk to v18.hdf5_1_8_15_precodefreeze_final_commit
Bug fix: cmakehdf5 broken because zlib is no longer configure in by default.
That broke the testings as some testfiles have zlib compressed datasets.
Added options control to enable the linking of zlib external libarary by
default and turn off the szip library linking as szip library may not be
avaiable. This matches the established settings.
Tested: run cmakehdf5 by hand in jam and platypus.
Also tested in wren but it failed in the testing stage.
Also tried "cmakehdf5 --script" in jam. It failed.
| -rwxr-xr-x | bin/cmakehdf5 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/bin/cmakehdf5 b/bin/cmakehdf5 index 7ecb19c..1f0fb7c 100755 --- a/bin/cmakehdf5 +++ b/bin/cmakehdf5 @@ -49,6 +49,8 @@ enable_f2003=-DHDF5_ENABLE_F2003:BOOL=OFF # Fortran2003 interface default off build_hl_lib=-DHDF5_BUILD_HL_LIB:BOOL=ON # High Level interface default on build_testing=-DBUILD_TESTING:BOOL=ON # Build tests default on build_tools=-DHDF5_BUILD_TOOLS:BOOL=ON # Build tools default on +with_zlib=-DHDF5_ENABLE_Z_LIB_SUPPORT=ON # enable zlib filter default on +with_szlib=-DHDF5_ENABLE_SZIP_SUPPORT=OFF # enables zlib filter default off #============= @@ -82,6 +84,12 @@ Usage: $progname [<options>] enable or disable building tools. Default is on. --enable-testing | --disable-testing: enable or disable building tests. Default is on. + --with-zlib=INC,LIB | --without-zlib: + Use zlib library for external deflate I/O filter. Default is on. + INC and LIB are the include and lib directories. + --with-szlib=INC,LIB| --without-szlib: + Use szip library for external szip library I/O filter. Default is off. + INC and LIB are the include and lib directories. --help: shows details help page EOF } @@ -208,12 +216,15 @@ echo Running Cmake for HDF5-${version} ... # 4. Configure the C library, tools and tests with this command: STEP "Configure..." "cmake \ + -C $cacheinit \ $build_cpp_lib \ $build_fortran \ $enable_f2003 \ $build_hl_lib \ $build_testing \ $build_tools \ + $with_zlib \ + $with_szlib \ $srcdir" $configlog # 5. Build the C library, tools and tests with this command: |