diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-04-23 17:50:15 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-04-23 17:50:15 (GMT) |
| commit | ed5a2bc1c1b8b4d81a3eaeedb7d523d3365dc32a (patch) | |
| tree | 64b8ad9c185d3cee68b6f2966321405914d0896a | |
| parent | 00648b6875e09602231b953b3b28b270cc308a11 (diff) | |
| download | hdf5-ed5a2bc1c1b8b4d81a3eaeedb7d523d3365dc32a.zip hdf5-ed5a2bc1c1b8b4d81a3eaeedb7d523d3365dc32a.tar.gz hdf5-ed5a2bc1c1b8b4d81a3eaeedb7d523d3365dc32a.tar.bz2 | |
[svn-r23614] Remove subfolders for includes
| -rw-r--r-- | c++/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | config/cmake/hdf5-config.cmake.install.in | 8 | ||||
| -rw-r--r-- | fortran/src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | hl/c++/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | hl/fortran/src/CMakeLists.txt | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt index fea68cd..cf5bd07 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt @@ -96,7 +96,7 @@ INSTALL ( FILES ${CPP_HDRS} DESTINATION - ${HDF5_INSTALL_INCLUDE_DIR}/cpp + ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT cppheaders ) diff --git a/config/cmake/hdf5-config.cmake.install.in b/config/cmake/hdf5-config.cmake.install.in index 6b90496..e3d8bfc 100644 --- a/config/cmake/hdf5-config.cmake.install.in +++ b/config/cmake/hdf5-config.cmake.install.in @@ -29,19 +29,19 @@ SET (HDF5_PACKAGE_EXTLIBS @HDF5_PACKAGE_EXTLIBS@) SET (HDF5_INCLUDE_DIR "${_IMPORT_PREFIX}/include" )
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)
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index c41916a..1bddc56 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -254,7 +254,7 @@ INSTALL ( ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h ${HDF5_F90_BINARY_DIR}/H5fortran_types.f90 DESTINATION - ${HDF5_INSTALL_INCLUDE_DIR}/fortran + ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT fortheaders ) @@ -264,7 +264,7 @@ IF (WIN32 AND NOT CYGWIN) DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/ DESTINATION - ${HDF5_INSTALL_INCLUDE_DIR}/fortran + ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT fortheaders ) @@ -273,7 +273,7 @@ ELSE (WIN32 AND NOT CYGWIN) DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/ DESTINATION - ${HDF5_INSTALL_INCLUDE_DIR}/fortran + ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT fortheaders ) diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt index 5a2a7c4..89de4ca 100644 --- a/hl/c++/src/CMakeLists.txt +++ b/hl/c++/src/CMakeLists.txt @@ -27,7 +27,7 @@ INSTALL ( FILES ${HDF5_HL_CPP_HDRS} DESTINATION - ${HDF5_INSTALL_INCLUDE_DIR}/hl/cpp + ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT hlcppheaders ) diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index c580516..9ab0fb2 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -76,7 +76,7 @@ IF (WIN32 AND NOT CYGWIN) DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/ DESTINATION - ${HDF5_INSTALL_INCLUDE_DIR}/fortran + ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT fortheaders ) @@ -85,7 +85,7 @@ ELSE (WIN32 AND NOT CYGWIN) DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/ DESTINATION - ${HDF5_INSTALL_INCLUDE_DIR}/fortran + ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT fortheaders ) |