diff options
| author | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2019-01-02 19:23:54 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2019-01-02 19:23:54 (GMT) |
| commit | d3dff6efe6f769b219f9dcccebd057afe75ed3c7 (patch) | |
| tree | a4b0146909d9468a0a44921bd2e3a494d9cdb77e /test/CMakeLists.txt | |
| parent | 7f9c45999567ca5f1db89127cf101a9fae27aba1 (diff) | |
| parent | 71f4e1832c737e2fb76385bc478fad7f39d89ab8 (diff) | |
| download | hdf5-d3dff6efe6f769b219f9dcccebd057afe75ed3c7.zip hdf5-d3dff6efe6f769b219f9dcccebd057afe75ed3c7.tar.gz hdf5-d3dff6efe6f769b219f9dcccebd057afe75ed3c7.tar.bz2 | |
Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop
Resolve conflicts:
Conflicts:
test/Makefile.am
Diffstat (limited to 'test/CMakeLists.txt')
| -rw-r--r-- | test/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a82fe82..0d67485 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -133,7 +133,7 @@ if (BUILD_SHARED_LIBS) # Define VOL Plugin Test Sources #----------------------------------------------------------------------------- set (VOL_PLUGIN_LIBS - echo_vol + null_vol_connector ) foreach (vol_lib ${VOL_PLUGIN_LIBS}) |