diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-10-23 21:38:58 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-10-23 21:38:58 (GMT) |
| commit | 0af5d139b6c8235d26b7fa850fbe11f9956133d7 (patch) | |
| tree | 3024c8d96bfa5e35ebbd0c9d4e0dedcdf747aaec | |
| parent | ebbd2f3ffd3cbe4c4f572a7ec8b79351687add3c (diff) | |
| download | hdf5-0af5d139b6c8235d26b7fa850fbe11f9956133d7.zip hdf5-0af5d139b6c8235d26b7fa850fbe11f9956133d7.tar.gz hdf5-0af5d139b6c8235d26b7fa850fbe11f9956133d7.tar.bz2 | |
Fix MPI depends name
| -rw-r--r-- | config/toolchain/mingw64.cmake | 14 | ||||
| -rw-r--r-- | testpar/CMakeVFDTests.cmake | 3 | ||||
| -rw-r--r-- | tools/h5diff/CMakeTests.cmake | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/config/toolchain/mingw64.cmake b/config/toolchain/mingw64.cmake index 721c39a..fde5e38 100644 --- a/config/toolchain/mingw64.cmake +++ b/config/toolchain/mingw64.cmake @@ -1,10 +1,14 @@ +set(TOOLCHAIN_PREFIX x86_64-w64-mingw32) set (CMAKE_SYSTEM_NAME Windows) -set (CMAKE_C_COMPILER x86_64-w64-mingw32-gcc) -set (CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++) -set (CMAKE_RC_COMPILER x86_64-w64-mingw32-windres) -set (CMAKE_Fortran_COMPILER x86_64-w64-mingw32-gfortran) -set (CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32) +set (CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc) +set (CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++) +set (CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres) +set (CMAKE_Fortran_COMPILER ${TOOLCHAIN_PREFIX}-gfortran) +set (CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX} /usr/local/${TOOLCHAIN_PREFIX}) set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) set (CMAKE_CROSSCOMPILING_EMULATOR wine64) + +include_directories(/usr/local/${TOOLCHAIN_PREFIX}/include) +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols") diff --git a/testpar/CMakeVFDTests.cmake b/testpar/CMakeVFDTests.cmake index 0726da2..d21de10 100644 --- a/testpar/CMakeVFDTests.cmake +++ b/testpar/CMakeVFDTests.cmake @@ -57,6 +57,9 @@ macro (ADD_VFD_TEST vfdname resultcode) WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR}/${vfdname} ) endforeach () + set_tests_properties (MPI_TEST_VFD-${vfdname}-pflush1 PROPERTIES WILL_FAIL "true") + #set_property (TEST MPI_TEST_t_pflush1 PROPERTY PASS_REGULAR_EXPRESSION "PASSED") + set_tests_properties (MPI_TEST_VFD-${vfdname}-pflush2 PROPERTIES DEPENDS MPI_TEST_VFD-${vfdname}-pflush1) endif () endmacro () diff --git a/tools/h5diff/CMakeTests.cmake b/tools/h5diff/CMakeTests.cmake index 8209f86..ba1631c 100644 --- a/tools/h5diff/CMakeTests.cmake +++ b/tools/h5diff/CMakeTests.cmake @@ -397,7 +397,7 @@ if (last_test) set_tests_properties (MPI_TEST_H5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test}) endif () - set (last_test "PH5DIFF-${resultfile}") + set (last_test "MPI_TEST_H5DIFF-${resultfile}") endif () endmacro () |