diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-08-25 21:11:06 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-08-25 21:11:06 (GMT) |
| commit | a9c4db3af80391b2ce250b44d69b02fcdf3b8cbe (patch) | |
| tree | 01a4e9aaa3a68cd306581372ff009134a7afce7d /config | |
| parent | 584c42ad94cf539caa9ddb66a1c8c6af56835b25 (diff) | |
| download | hdf5-a9c4db3af80391b2ce250b44d69b02fcdf3b8cbe.zip hdf5-a9c4db3af80391b2ce250b44d69b02fcdf3b8cbe.tar.gz hdf5-a9c4db3af80391b2ce250b44d69b02fcdf3b8cbe.tar.bz2 | |
[svn-r25551] JAVA-1880: hdfview failure to load plugins identified default value was incorrectly formed.
Tested: windows
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 2 | ||||
| -rw-r--r-- | config/cmake/hdf5-config.cmake.install.in | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index 9330546..a884f2e 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -91,7 +91,7 @@ set (H5_DEFAULT_VFD H5FD_SEC2) if (NOT DEFINED "H5_DEFAULT_PLUGINDIR") if (WINDOWS) - set (H5_DEFAULT_PLUGINDIR "%ALLUSERSPROFILE%/hdf5/lib/plugin") + set (H5_DEFAULT_PLUGINDIR "%ALLUSERSPROFILE%\\hdf5\\lib\\plugin") else (WINDOWS) set (H5_DEFAULT_PLUGINDIR "/usr/local/hdf5/lib/plugin") endif (WINDOWS) diff --git a/config/cmake/hdf5-config.cmake.install.in b/config/cmake/hdf5-config.cmake.install.in index c275511..c1c4498 100644 --- a/config/cmake/hdf5-config.cmake.install.in +++ b/config/cmake/hdf5-config.cmake.install.in @@ -37,19 +37,19 @@ ENDIF(HDF5_ENABLE_PARALLEL) set (HDF5_INCLUDE_DIR "${_IMPORT_PREFIX}/include" "${HDF5_MPI_C_INCLUDE_PATH}" ) if (HDF5_BUILD_FORTRAN) - set (HDF5_INCLUDE_DIR_FORTRAN "${_IMPORT_PREFIX}/include/fortran" ) + set (HDF5_INCLUDE_DIR_FORTRAN "${_IMPORT_PREFIX}/include" ) endif (HDF5_BUILD_FORTRAN) if (HDF5_BUILD_CPP_LIB) - set (HDF5_INCLUDE_DIR_CPP "${_IMPORT_PREFIX}/include/cpp" ) + set (HDF5_INCLUDE_DIR_CPP "${_IMPORT_PREFIX}/include" ) endif (HDF5_BUILD_CPP_LIB) if (HDF5_BUILD_HL_LIB) - set (HDF5_INCLUDE_DIR_HL "${_IMPORT_PREFIX}/include/hl" ) + set (HDF5_INCLUDE_DIR_HL "${_IMPORT_PREFIX}/include" ) endif (HDF5_BUILD_HL_LIB) if (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB) - set (HDF5_INCLUDE_DIR_HL_CPP "${_IMPORT_PREFIX}/include/hl/cpp" ) + set (HDF5_INCLUDE_DIR_HL_CPP "${_IMPORT_PREFIX}/include" ) endif (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB) if (HDF5_BUILD_TOOLS) |