diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-08-31 20:15:13 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-08-31 20:15:13 (GMT) |
| commit | e65aa8c36566febd00da128e64cc90f3c8ffbc70 (patch) | |
| tree | 1c52c1ccdf6b28b73702da3b49bad78f5414b33c /hl/test | |
| parent | b8d1216dcac1b773f9a7f757ee4dca67547dc082 (diff) | |
| download | hdf5-e65aa8c36566febd00da128e64cc90f3c8ffbc70.zip hdf5-e65aa8c36566febd00da128e64cc90f3c8ffbc70.tar.gz hdf5-e65aa8c36566febd00da128e64cc90f3c8ffbc70.tar.bz2 | |
[svn-r19325] Added parallel build commands.
Corrected use/name of source folder aliases.
Duplicated FindMPI.cmake so that non-c++ compiler is found first (recommemded commands did not work).
Tested: local linux with mpich
Diffstat (limited to 'hl/test')
| -rw-r--r-- | hl/test/CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/hl/test/CMakeLists.txt b/hl/test/CMakeLists.txt index 91d7c80..d016aed 100644 --- a/hl/test/CMakeLists.txt +++ b/hl/test/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required (VERSION 2.8) +PROJECT (HDF5_HL_TEST) # -------------------------------------------------------------------- # Notes: When creating unit test executables they should be prefixed # with "hl_". This allows for easier filtering of the test suite when @@ -7,8 +8,6 @@ cmake_minimum_required (VERSION 2.8) # which would only run the High Level based unit tests. # -------------------------------------------------------------------- -PROJECT (HDF5_HL_TEST) - #----------------------------------------------------------------------------- # Generate the H5srcdir_str.h file containing user settings needed by compilation #----------------------------------------------------------------------------- @@ -16,7 +15,7 @@ SET (srcdir ${CMAKE_CURRENT_SOURCE_DIR}) CONFIGURE_FILE (${HDF5_HL_TEST_SOURCE_DIR}/H5srcdir_str.h.in H5srcdir_str.h @ONLY) INCLUDE_DIRECTORIES (${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES (${HDF5_TEST_SOURCE_DIR}) +INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR}) # -------------------------------------------------------------------- # Macro used to add a unit test @@ -42,7 +41,9 @@ MACRO (HL_ADD_TEST hl_name files) ADD_TEST (NAME hl_${hl_name} COMMAND $<TARGET_FILE:hl_${hl_name}>) + # -------------------------------------------------------------------- #-- Copy the necessary files. + # -------------------------------------------------------------------- FOREACH (h5_file ${files}) SET (dest "${HDF5_HL_TEST_BINARY_DIR}/${h5_file}") #MESSAGE (STATUS " Copying HL Test File ${h5_file} to ${dest}") @@ -66,7 +67,7 @@ HL_ADD_TEST (test_table "test_table_be.hdf5;test_table_cray.hdf5;test_table_le.h # This executable is used to generate test files for the test_ds test. # It should only be run during development when new test files are needed # -------------------------------------------------------------------- -IF (NOT BUILD_SHARED_LIBS) +IF (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS) ADD_EXECUTABLE (hl_gen_test_ds gen_test_ds.c) H5_NAMING (hl_gen_test_ds) IF (WIN32) @@ -84,4 +85,4 @@ IF (NOT BUILD_SHARED_LIBS) ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET} ) -ENDIF (NOT BUILD_SHARED_LIBS) +ENDIF (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS) |