diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-06-10 14:52:54 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-06-10 14:52:54 (GMT) |
| commit | a2f0603135d8311520f2f7345bd9a78d124f26c8 (patch) | |
| tree | bd0c08435a208134b02b1eedc853215e051a972d /hl/fortran | |
| parent | 864a502671cefa001b6d7417389fc4a265cf8516 (diff) | |
| download | hdf5-a2f0603135d8311520f2f7345bd9a78d124f26c8.zip hdf5-a2f0603135d8311520f2f7345bd9a78d124f26c8.tar.gz hdf5-a2f0603135d8311520f2f7345bd9a78d124f26c8.tar.bz2 | |
[svn-r20960] Added new source files.
Added new test and test files to test section
Tested: local linux
Diffstat (limited to 'hl/fortran')
| -rw-r--r-- | hl/fortran/src/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | hl/fortran/test/CMakeLists.txt | 9 |
2 files changed, 15 insertions, 4 deletions
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index e55fcd4..c8c602b 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -15,6 +15,7 @@ INCLUDE_DIRECTORIES ( # hl_f90CStub lib #----------------------------------------------------------------------------- SET (HDF5_HL_F90_C_SRCS + ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5DSfc.c ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTfc.c ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5IMfc.c ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5IMcc.c @@ -34,6 +35,7 @@ H5_SET_LIB_OPTIONS (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_HL_F90_C_LIB_NAME} ${LIB_ # Fortran Modules #----------------------------------------------------------------------------- SET (HDF5_HL_F90_F_SRCS + ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5DSff.f90 ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5TBff.f90 ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTff.f90 ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5IMff.f90 @@ -44,9 +46,9 @@ SET (SHARED_LINK_FLAGS " ") IF (BUILD_SHARED_LIBS) IF (WIN32 AND NOT CYGWIN) SET_PROPERTY (TARGET ${HDF5_HL_F90_LIB_TARGET} - APPEND PROPERTY COMPILE_DEFINITIONS - BUILD_HDF5_DLL - ) + APPEND PROPERTY COMPILE_DEFINITIONS + BUILD_HDF5_DLL + ) IF (MSVC) SET (SHARED_LINK_FLAGS "/DLL") ENDIF (MSVC) @@ -55,7 +57,7 @@ ENDIF (BUILD_SHARED_LIBS) IF (WIN32 AND NOT CYGWIN) SET_PROPERTY (TARGET ${HDF5_HL_F90_LIB_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS - HDF5F90_WINDOWS + HDF5F90_WINDOWS ) ENDIF (WIN32 AND NOT CYGWIN) TARGET_FORTRAN_WIN_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} ${SHARED_LINK_FLAGS}) diff --git a/hl/fortran/test/CMakeLists.txt b/hl/fortran/test/CMakeLists.txt index 0a91b85..470aab9 100644 --- a/hl/fortran/test/CMakeLists.txt +++ b/hl/fortran/test/CMakeLists.txt @@ -20,6 +20,15 @@ ADD_TEST ( f1tab.h5 ) +#-- Adding test for hl_f90_tstds +ADD_EXECUTABLE (hl_f90_tstds tstds.f90) +TARGET_NAMING (hl_f90_tstds ${LIB_TYPE}) +TARGET_FORTRAN_WIN_PROPERTIES (hl_f90_tstds "") +TARGET_LINK_LIBRARIES (hl_f90_tstds ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET}) +SET_TARGET_PROPERTIES (hl_f90_tstds PROPERTIES LINKER_LANGUAGE Fortran) + +ADD_TEST (NAME hl_f90_tstds COMMAND $<TARGET_FILE:hl_f90_tstds>) + #-- Adding test for hl_f90_tstlite ADD_EXECUTABLE (hl_f90_tstlite tstlite.f90) TARGET_NAMING (hl_f90_tstlite ${LIB_TYPE}) |