Added new tests to CMake test system.

This commit is contained in:
Ward Fisher 2013-02-06 23:09:19 +00:00
parent ccb523fb56
commit 8d6bfcd534
2 changed files with 36 additions and 12 deletions

View File

@ -54,7 +54,7 @@ INCLUDE (${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
INCLUDE (${CMAKE_ROOT}/Modules/CheckSymbolExists.cmake)
INCLUDE (${CMAKE_ROOT}/Modules/FindPkgConfig.cmake)
INCLUDE (${CMAKE_ROOT}/Modules/GetPrerequisites.cmake)
MESSAGE(${CMAKE_ROOT})
# Only necessary for Windows
IF(MSVC)
INCLUDE (${CMAKE_SOURCE_DIR}/cmake/modules/windows/FindHDF5.cmake)
@ -338,15 +338,6 @@ IF(MSVC)
SET(USE_X_GETOPT ON CACHE BOOL "")
ENDIF()
ENDIF()
# Does the user want to turn on PNETCDF read ability?
OPTION (ENABLE_PNETCDF "Enable parallel I/O for classic and 64-bit offset files using parallel-netcdf." OFF)
IF(ENABLE_PNETCDF)
FIND_LIBRARY(PNETCDF NAMES pnetcdf)
IF(NOT PNETCDF)
MESSAGE(FATAL_ERROR "Cannot find pnetcdf library, yet pnetcdf support was requested.")
ENDIF()
SET(USE_PNETCDF ON CACHE BOOL "")
ENDIF()
SET(MATH "")
IF(NOT WIN32)
@ -412,6 +403,39 @@ IF(NOT ENABLE_NETCDF_4 AND ENABLE_EXAMPLE_TESTS)
SET (ENABLE_EXAMPLE_TESTS OFF)
ENDIF()
# Options to enable parallel IO, tests.
OPTION(ENABLE_PNETCDF "Build netCDF-4 with parallel I/O for classic and 64-bit offset files using parallel-netcdf." OFF)
IF(ENABLE_PNETCDF)
SET(USE_PARALLEL ON CACHE BOOL "")
# Check for H5Pget_fapl_mpiposx, define USE_PARALLEL_POSIX
CHECK_FUNCTION_EXISTS(H5Pget_fapl_mpioposix USE_PARALLEL_POSIX)
# Else Check for H5Pget_fapl_mpio, define USE_PARALLEL_MPIO
IF(NOT USE_PARALLEL_POSIX)
CHECK_FUNCTION_EXISTS(H5Pget_fapl_mpio USE_PARALLEL_MPIO)
ENDIF()
# Else bail
IF(NOT USE_PARALLEL_POSIX AND NOT USE_PARALLEL_MPIO)
SET(USE_PARALLEL OFF CACHE BOOL "")
MESSAGE("Cannot find HDF5 library built with parallel support. Disabling parallel build.")
ELSE()
# Check for ncmpi_create in libpnetcdf, define USE_PNETCDF
# Does the user want to turn on PNETCDF read ability?
IF(ENABLE_PNETCDF)
FIND_LIBRARY(PNETCDF NAMES pnetcdf)
IF(NOT PNETCDF)
MESSAGE(FATAL_ERROR "Cannot find pnetcdf library, yet pnetcdf support was requested.")
ENDIF()
SET(USE_PNETCDF ON CACHE BOOL "")
ENDIF()
ENDIF()
ENDIF()
OPTION (ENABLE_PARALLEL_TESTS "Enable Parallel IO Tests. Ignored if NetCDF4 is not enabled, or if there is no parallel I/O Support." OFF)
OPTION (ENABLE_DOXYGEN "Enable generation of doxygen." OFF)

View File

@ -7,8 +7,8 @@ tst_compounds tst_compounds2 tst_compounds3 tst_opaques tst_strings
tst_strings2 tst_interops tst_interops4 tst_interops6
tst_enums tst_coords tst_coords2 tst_coords3 tst_vars3 tst_vars4
tst_chunks tst_chunks2 tst_utf8 tst_fills tst_fills2 tst_fillbug
tst_xplatform tst_xplatform2 tst_h_atts2 tst_endian_fill
t_type cdm_sea_soundings tst_vl
tst_xplatform tst_xplatform2 tst_h_atts2 tst_endian_fill tst_atts
t_type cdm_sea_soundings tst_vl tst_atts1 tst_atts2
tst_vars2 tst_files5 tst_files6 tst_sync tst_h_strbug)
IF(NOT MSVC)