summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-05-17 20:44:02 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-05-17 20:44:02 (GMT)
commit3c36cd61d9dd6b921742bc98e3c96e217bc588ff (patch)
treee95cbe087b2a30449b9fe0b23050976d21135f71 /fortran
parentaa361aeff9af404c580e411247ec3094f36fcd9d (diff)
downloadhdf5-3c36cd61d9dd6b921742bc98e3c96e217bc588ff.zip
hdf5-3c36cd61d9dd6b921742bc98e3c96e217bc588ff.tar.gz
hdf5-3c36cd61d9dd6b921742bc98e3c96e217bc588ff.tar.bz2
Fix Fortran feature var usage and message syntax
Diffstat (limited to 'fortran')
-rw-r--r--fortran/src/CMakeLists.txt4
-rw-r--r--fortran/src/H5test_kind_SIZEOF.f902
-rw-r--r--fortran/test/CMakeLists.txt2
3 files changed, 4 insertions, 4 deletions
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index 1c0de1a..c4e1244 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -27,7 +27,7 @@ set (Fortran_COMPILER_ID CMAKE_Fortran_COMPILER_ID)
# H5fortran_detect.f90 used to generate H5fort_type_defines.h
# H5fort_type_defines.h used to generate H5f90i_gen.h + H5fortran_types.f90
#-----------------------------------------------------------------------------
-if (FORTRAN_HAVE_STORAGE_SIZE)
+if (H5_FORTRAN_HAVE_STORAGE_SIZE)
add_executable (H5test_FortranHavekind
${HDF5_F90_SRC_SOURCE_DIR}/H5test_kind_STORAGE_SIZE.f90
)
@@ -38,7 +38,7 @@ if (FORTRAN_HAVE_STORAGE_SIZE)
endif ()
set (H5_TEST_KIND_NAME "h5test_kind_storage_size_mod")
else ()
- if (FORTRAN_HAVE_SIZEOF)
+ if (H5_FORTRAN_HAVE_SIZEOF)
add_executable (H5test_FortranHavekind
${HDF5_F90_SRC_SOURCE_DIR}/H5test_kind_SIZEOF.f90
)
diff --git a/fortran/src/H5test_kind_SIZEOF.f90 b/fortran/src/H5test_kind_SIZEOF.f90
index 137cc48..e16adcb 100644
--- a/fortran/src/H5test_kind_SIZEOF.f90
+++ b/fortran/src/H5test_kind_SIZEOF.f90
@@ -17,7 +17,7 @@
! function SIZEOF is available. It generates code that makes use of SIZEOF in
! H5fortran_detect.f90 which is a portable solution but is not standard
! compliant. The program H5test_kind_C_SIZEOF uses F2008 standard intrinsic
-! function instead, which is the preferred method.
+! function instead, which is the preferred method.
!
! The availability of SIZEOF is checked at configure time and the TRUE/FALSE
! condition is set in the configure variable "FORTRAN_HAVE_SIZEOF".
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index bcf065f..ac501ea 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -55,7 +55,7 @@ endif ()
# fall back to F2003. If F2003 not supported then use F90 for the tests.
set_source_files_properties (tf_F90.f90 tf_F03.f90 tf_F08.f90 tf.f90 PROPERTIES LANGUAGE Fortran)
-if (FORTRAN_HAVE_STORAGE_SIZE AND FORTRAN_HAVE_C_SIZEOF)
+if (H5_FORTRAN_HAVE_STORAGE_SIZE AND H5_FORTRAN_HAVE_C_SIZEOF)
add_library (${HDF5_F90_TEST_LIB_TARGET} STATIC tf_F08.f90 tf.f90)
if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
add_library (${HDF5_F90_TEST_LIBSH_TARGET} SHARED tf_F08.f90 tf.f90)