[svn-r26885] Fixed issues with CMake and Fortran on linux.

This commit is contained in:
Scot Breitenfeld 2015-04-22 13:50:29 -05:00
parent aad4f74fa9
commit 0a5ca8ad05
3 changed files with 40 additions and 6 deletions

View File

@ -307,6 +307,7 @@
./fortran/src/H5match_types.c
./fortran/src/HDF5.F90
./fortran/src/H5config_f.inc.in
./fortran/src/H5config_f.inc.cmake
./fortran/src/Makefile.am
./fortran/src/Makefile.in
./fortran/src/README

View File

@ -19,6 +19,16 @@ if (WIN32)
endif (BUILD_SHARED_LIBS)
endif (WIN32)
# configure for Fortran preprocessor
# Define Parallel variable for passing to H5config_f.inc.cmake
set (CMAKE_H5_HAVE_PARALLEL 0)
if (H5_HAVE_PARALLEL)
set (CMAKE_H5_HAVE_PARALLEL 1)
endif (H5_HAVE_PARALLEL)
configure_file (${HDF5_F90_SRC_SOURCE_DIR}/H5config_f.inc.cmake ${CMAKE_BINARY_DIR}/H5config_f.inc @ONLY)
#-----------------------------------------------------------------------------
# Setup the Fortran auto-detection utilities
# H5test_kind.F90 used to generate H5fortran_detect.F90
@ -120,12 +130,6 @@ set (f90CStub_C_SRCS
${HDF5_F90_SRC_SOURCE_DIR}/H5Zf.c
)
if (H5_HAVE_PARALLEL)
set (f90CStub_C_SRCS
${f90CStub_C_SRCS}
${HDF5_F90_SRC_SOURCE_DIR}/H5FDmpiof.c
)
endif (H5_HAVE_PARALLEL)
set_source_files_properties (${f90CStub_C_SRCS} PROPERTIES LANGUAGE C)
set (f90CStub_C_HDRS

View File

@ -0,0 +1,29 @@
! fortran/src/H5config_f.inc. Generated from fortran/src/H5config_f.inc.in by configure
! Define if we have parallel support
#define H5_HAVE_PARALLEL @CMAKE_H5_HAVE_PARALLEL@
#if H5_HAVE_PARALLEL==0
#undef H5_HAVE_PARALLEL
#endif
! Define if the intrinsic function STORAGE_SIZE exists
#define H5_FORTRAN_HAVE_STORAGE_SIZE @FORTRAN_HAVE_STORAGE_SIZE@
#if H5_FORTRAN_HAVE_STORAGE_SIZE==0
#undef H5_FORTRAN_HAVE_STORAGE_SIZE
#endif
! Define if the intrinsic function SIZEOF exists
#define H5_FORTRAN_HAVE_SIZEOF @FORTRAN_HAVE_SIZEOF@
#if H5_FORTRAN_HAVE_SIZEOF==0
#undef H5_FORTRAN_HAVE_SIZEOF
#endif
! Define if the intrinsic function C_SIZEOF exists
#define H5_FORTRAN_HAVE_C_SIZEOF @FORTRAN_HAVE_C_SIZEOF@
#if H5_FORTRAN_HAVE_C_SIZEOF==0
#undef H5_FORTRAN_HAVE_C_SIZEOF
#endif