diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-09-19 16:38:08 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-09-19 16:38:08 (GMT) |
| commit | 0653325f0d4a92164842bb30b797f130e44cbc68 (patch) | |
| tree | 15fde81b28e60d8fcae7864edf0281a3ffdca153 /config/cmake | |
| parent | 4182c81addaaac3e4234369dc5a0089fb93756d9 (diff) | |
| download | hdf5-0653325f0d4a92164842bb30b797f130e44cbc68.zip hdf5-0653325f0d4a92164842bb30b797f130e44cbc68.tar.gz hdf5-0653325f0d4a92164842bb30b797f130e44cbc68.tar.bz2 | |
[svn-r24167] HDFFV-8513, HDFFV-8522 Plugin testing in h5repack, h5dump.
Add more usage info for UserMacros.
Add new option information about the Plugin default path.
Tested: local linux, jam
Diffstat (limited to 'config/cmake')
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 8 | ||||
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 2 | ||||
| -rw-r--r-- | config/cmake/UserMacros/Windows_MT.cmake | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index e495d9b..58c790d 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -152,13 +152,13 @@ ENDIF (WIN32) # SET (H5_DEFAULT_VFD H5FD_SEC2) -IF (NOT DEFINED "H5_DEFAULT_PLUGIN") +IF (NOT DEFINED "H5_DEFAULT_PLUGINDIR") IF (WINDOWS) - SET (H5_DEFAULT_PLUGIN "%ALLUSERSPROFILE%/hdf5/lib/plugin") + SET (H5_DEFAULT_PLUGINDIR "%ALLUSERSPROFILE%/hdf5/lib/plugin") ELSE (WINDOWS) - SET (H5_DEFAULT_PLUGIN "/usr/local/hdf5/lib/plugin") + SET (H5_DEFAULT_PLUGINDIR "/usr/local/hdf5/lib/plugin") ENDIF (WINDOWS) -ENDIF (NOT DEFINED "H5_DEFAULT_PLUGIN") +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 2160ee8..ede2ffd 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -55,7 +55,7 @@ #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_PLUGIN "@H5_DEFAULT_PLUGIN@" +#cmakedefine H5_DEFAULT_PLUGINDIR "@H5_DEFAULT_PLUGINDIR@" /* Define the default virtual file driver to compile */ #cmakedefine H5_DEFAULT_VFD @H5_DEFAULT_VFD@ diff --git a/config/cmake/UserMacros/Windows_MT.cmake b/config/cmake/UserMacros/Windows_MT.cmake index 9be5404..175c420 100644 --- a/config/cmake/UserMacros/Windows_MT.cmake +++ b/config/cmake/UserMacros/Windows_MT.cmake @@ -4,6 +4,8 @@ # To use this option, copy both the macro and option code # into the root UserMacros.cmake file. +# OR add an include to the root UserMacros.cmake file: +# INCLUDE(path_to_file/WINDOWS_MT.cmake) #----------------------------------------------------------------------------- # Option to Build with Static CRT libraries on Windows |