diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-09-26 22:10:54 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-09-26 22:10:54 (GMT) |
| commit | deddc7f9558d76a4cebc417af8d426877d5aee7d (patch) | |
| tree | e2e43dea685c798debbbe6ae14f7297738c0bfbd /config | |
| parent | e2dfb53df72ca884cb9225e738aef77135f92e68 (diff) | |
| download | hdf5-deddc7f9558d76a4cebc417af8d426877d5aee7d.zip hdf5-deddc7f9558d76a4cebc417af8d426877d5aee7d.tar.gz hdf5-deddc7f9558d76a4cebc417af8d426877d5aee7d.tar.bz2 | |
[svn-r24205] Merge HDFFV-8513/8522 from trunk (via cmake branch), h5repack UD plugins.
Also warning session fixes.
Tested: CMake local linux
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 8 | ||||
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index bec8477..af7a51b 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -152,6 +152,14 @@ ENDIF (WIN32) # SET (H5_DEFAULT_VFD H5FD_SEC2) +IF (NOT DEFINED "H5_DEFAULT_PLUGINDIR") + IF (WINDOWS) + SET (H5_DEFAULT_PLUGINDIR "%ALLUSERSPROFILE%/hdf5/lib/plugin") + ELSE (WINDOWS) + SET (H5_DEFAULT_PLUGINDIR "/usr/local/hdf5/lib/plugin") + ENDIF (WINDOWS) +ENDIF (NOT DEFINED "H5_DEFAULT_PLUGINDIR") + IF (WINDOWS) SET (H5_HAVE_WINDOWS 1) # ---------------------------------------------------------------------- diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index 7847dfc..5f3764c 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -54,6 +54,9 @@ problem converting from unsigned long long to long double */ #cmakedefine H5_CYGWIN_ULLONG_TO_LDOUBLE_ROUND_PROBLEM @H5_CYGWIN_ULLONG_TO_LDOUBLE_ROUND_PROBLEM@ +/* Define the default plugins path to compile */ +#cmakedefine H5_DEFAULT_PLUGINDIR "@H5_DEFAULT_PLUGINDIR@" + /* Define the default virtual file driver to compile */ #cmakedefine H5_DEFAULT_VFD @H5_DEFAULT_VFD@ |