diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-09-30 14:01:49 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-09-30 14:01:49 (GMT) |
| commit | bae6ab52199bd21d5e7f464ae308dae8646b2298 (patch) | |
| tree | 029ca0e6079814c2f84702b2d87f1255445ff14b /fortran | |
| parent | 1883ba281d3cb85f3525146acb5f78eddb230877 (diff) | |
| download | hdf5-bae6ab52199bd21d5e7f464ae308dae8646b2298.zip hdf5-bae6ab52199bd21d5e7f464ae308dae8646b2298.tar.gz hdf5-bae6ab52199bd21d5e7f464ae308dae8646b2298.tar.bz2 | |
[svn-r21435] Add F2003 IF-ENDIF protection blocks around _F03 file processing
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/examples/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | fortran/test/CMakeLists.txt | 25 |
2 files changed, 28 insertions, 2 deletions
diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt index 6ecfd37..c051612 100644 --- a/fortran/examples/CMakeLists.txt +++ b/fortran/examples/CMakeLists.txt @@ -63,14 +63,14 @@ FOREACH (example ${examples}) ENDFOREACH (example ${examples}) +IF (FORTRAN_HAVE_ISO_C_BINDING AND HDF5_ENABLE_F2003) FOREACH (example ${F2003_examples}) ADD_EXECUTABLE (f03_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90) TARGET_NAMING (f03_ex_${example} ${LIB_TYPE}) TARGET_FORTRAN_WIN_PROPERTIES (f03_ex_${example} "") IF (WIN32 AND NOT CYGWIN) SET_PROPERTY (TARGET f03_ex_${example} - APPEND PROPERTY COMPILE_DEFINITIONS - HDF5F90_WINDOWS + APPEND PROPERTY COMPILE_DEFINITIONS HDF5F90_WINDOWS ) ENDIF (WIN32 AND NOT CYGWIN) TARGET_LINK_LIBRARIES (f03_ex_${example} @@ -88,6 +88,7 @@ FOREACH (example ${F2003_examples}) ENDIF (BUILD_TESTING) ENDFOREACH (example ${F2003_examples}) +ENDIF (FORTRAN_HAVE_ISO_C_BINDING AND HDF5_ENABLE_F2003) IF (H5_HAVE_PARALLEL) diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt index 90de6a9..508eaa9 100644 --- a/fortran/test/CMakeLists.txt +++ b/fortran/test/CMakeLists.txt @@ -99,6 +99,31 @@ SET_TARGET_PROPERTIES (testhdf5_fortran_1_8 PROPERTIES LINKER_LANGUAGE Fortran) ADD_TEST (NAME testhdf5_fortran_1_8 COMMAND $<TARGET_FILE:testhdf5_fortran_1_8>) +#-- Adding test for fortranlib_test_F03 +IF (FORTRAN_HAVE_ISO_C_BINDING AND HDF5_ENABLE_F2003) + ADD_EXECUTABLE (fortranlib_test_F03 + fortranlib_test_F03.f90 + tH5F.f90 + tH5E_F03.f90 + tH5L_F03.f90 + tH5P_F03.f90 + tH5T_F03.f90 + ) + TARGET_NAMING (fortranlib_test_F03 ${LIB_TYPE}) + TARGET_FORTRAN_WIN_PROPERTIES (fortranlib_test_F03 "") + TARGET_LINK_LIBRARIES (fortranlib_test_F03 + ${HDF5_F90_TEST_LIB_TARGET} + ${HDF5_F90_LIB_TARGET} + ${HDF5_LIB_TARGET} + ) + IF (WIN32 AND MSVC) + TARGET_LINK_LIBRARIES (fortranlib_test_F03 "ws2_32.lib") + ENDIF (WIN32 AND MSVC) + SET_TARGET_PROPERTIES (fortranlib_test_F03 PROPERTIES LINKER_LANGUAGE Fortran) + + ADD_TEST (NAME fortranlib_test_F03 COMMAND $<TARGET_FILE:fortranlib_test_F03>) +ENDIF (FORTRAN_HAVE_ISO_C_BINDING AND HDF5_ENABLE_F2003) + #-- Adding test for fflush1 ADD_EXECUTABLE (fflush1 fflush1.f90) TARGET_NAMING (fflush1 ${LIB_TYPE}) |