Commit a1b603d4 authored by Martin Bauer's avatar Martin Bauer

Removed IntelMPI Workaround from CMake

- workaround seems to be not necessary any more, for recent IntelMPI versions
- the workaround did not play with CMake's try_compile function, which tries to compile some test programs to check for compiler features
  The workaround added '-include mpi.h' to the compile flags, which are also used by try_compile, but try_compile does not set include directories with "-I"
  This lead to the problem, that for example the OpenMP flag was not correctly determined, since there the try_compile mechanism is used
parent 33fe0883
......@@ -841,14 +841,6 @@ if ( WALBERLA_BUILD_WITH_MPI AND NOT WALBERLA_CXX_COMPILER_IS_MPI_WRAPPER )
add_flag ( CMAKE_MODULE_LINKER_FLAGS "${MPI_CXX_LINK_FLAGS}" )
add_flag ( CMAKE_EXE_LINKER_FLAGS "${MPI_CXX_LINK_FLAGS}" )
add_flag ( CMAKE_SHARED_LINKER_FLAGS "${MPI_CXX_LINK_FLAGS}" )
# When using Intel MPI, mpi.h has to be included before including the standard library
# therefore we use the -include flag to enforce this.
if ( MPI_C_INCLUDE_PATH MATCHES "intel" )
message (STATUS "Activating IntelMPI include workaround for mpi.h" )
add_flag ( CMAKE_CXX_FLAGS "-include mpi.h" )
add_flag ( CMAKE_C_FLAGS "-include mpi.h" )
endif ( )
endif ( )
endif ( )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment