summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2014-10-10 17:41:13 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2014-10-10 17:41:13 (GMT)
commit6fdac87ac1483c0ef1cbfc29a801f2b0b9c241e2 (patch)
tree51dcd958369aab8e641127af684321157b29c861
parentc7da369bfdbb595794194f931c85b83f88ffb253 (diff)
downloadhdf5-6fdac87ac1483c0ef1cbfc29a801f2b0b9c241e2.zip
hdf5-6fdac87ac1483c0ef1cbfc29a801f2b0b9c241e2.tar.gz
hdf5-6fdac87ac1483c0ef1cbfc29a801f2b0b9c241e2.tar.bz2
[svn-r25691] File is not generated by non-2003 compliant fortran compilers.
Tested: jam and local linux
-rw-r--r--fortran/src/CMakeLists.txt23
1 files changed, 20 insertions, 3 deletions
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index a4407e5..c91d9e8 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -38,7 +38,6 @@ else (FORTRAN_HAVE_STORAGE_SIZE)
add_executable (H5test_FortranHavekind
${HDF5_F90_SRC_SOURCE_DIR}/H5test_kind.f90
)
- set (H5_TEST_KIND_NAME "h5test_kind_mod")
endif (FORTRAN_HAVE_SIZEOF)
endif (FORTRAN_HAVE_STORAGE_SIZE)
if (WIN32 AND MSVC)
@@ -279,7 +278,6 @@ if (WIN32)
install (
FILES
${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/h5fortran_types.mod
- ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/${H5_TEST_KIND_NAME}.mod
${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/hdf5.mod
${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/h5global.mod
${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/h5a.mod
@@ -312,11 +310,20 @@ if (WIN32)
COMPONENT
fortheaders
)
+ if (H5_TEST_KIND_NAME)
+ install (
+ FILES
+ ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/${H5_TEST_KIND_NAME}.mod
+ DESTINATION
+ ${HDF5_INSTALL_INCLUDE_DIR}
+ COMPONENT
+ fortheaders
+ )
+ endif (H5_TEST_KIND_NAME)
else (WIN32)
install (
FILES
${CMAKE_Fortran_MODULE_DIRECTORY}/h5fortran_types.mod
- ${CMAKE_Fortran_MODULE_DIRECTORY}/${H5_TEST_KIND_NAME}.mod
${CMAKE_Fortran_MODULE_DIRECTORY}/hdf5.mod
${CMAKE_Fortran_MODULE_DIRECTORY}/h5global.mod
${CMAKE_Fortran_MODULE_DIRECTORY}/h5f.mod
@@ -350,6 +357,16 @@ else (WIN32)
COMPONENT
fortheaders
)
+ if (H5_TEST_KIND_NAME)
+ install (
+ FILES
+ ${CMAKE_Fortran_MODULE_DIRECTORY}/${H5_TEST_KIND_NAME}.mod
+ DESTINATION
+ ${HDF5_INSTALL_INCLUDE_DIR}
+ COMPONENT
+ fortheaders
+ )
+ endif (H5_TEST_KIND_NAME)
endif (WIN32)
#-----------------------------------------------------------------------------