Commit 427a4bbf authored by Keith Bennett's avatar Keith Bennett

Merge branch 'hotfix/14.1.9'

parents 8c1d0aab 90aa0b12
Pipeline #1068 skipped
......@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.8)
if(PARALLEL)
find_package(MPI REQUIRED)
include_directories(${MPI_C_INCLUDE_PATH})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPARALLEL ${MPI_C_COMPILE_FLAGS}")
add_definitions(-DPARALLEL)
include(CMake/CheckMPIVersion.cmake)
endif()
......
......@@ -14,6 +14,11 @@ set(SOURCES
if(NOT TARGET sdfc)
add_library(sdfc STATIC ${SOURCES})
if(PARALLEL)
set_source_files_properties(
${SOURCES}
PROPERTIES COMPILE_FLAGS "${MPI_C_COMPILE_FLAGS}")
endif()
endif()
execute_process(COMMAND sh gen_commit_string.sh
......
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