diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-04-22 18:50:29 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-04-22 18:50:29 (GMT) |
| commit | 0a5ca8ad05ef2d2c8ffeb8205151e391e85b52c4 (patch) | |
| tree | 8cc4de4fec392878a32e5d0bf182446729eba658 | |
| parent | aad4f74fa93734099be7f10b037bf768eb0d8596 (diff) | |
| download | hdf5-0a5ca8ad05ef2d2c8ffeb8205151e391e85b52c4.zip hdf5-0a5ca8ad05ef2d2c8ffeb8205151e391e85b52c4.tar.gz hdf5-0a5ca8ad05ef2d2c8ffeb8205151e391e85b52c4.tar.bz2 | |
[svn-r26885] Fixed issues with CMake and Fortran on linux.
| -rw-r--r-- | MANIFEST | 1 | ||||
| -rw-r--r-- | fortran/src/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | fortran/src/H5config_f.inc.cmake | 29 |
3 files changed, 40 insertions, 6 deletions
@@ -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 diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index c0c2569..e683725 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -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 diff --git a/fortran/src/H5config_f.inc.cmake b/fortran/src/H5config_f.inc.cmake new file mode 100644 index 0000000..cbdfb9b --- /dev/null +++ b/fortran/src/H5config_f.inc.cmake @@ -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 |