Merged with master
This commit is contained in:
@@ -11,7 +11,7 @@ project(astaroth C CXX CUDA)
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
|
||||
|
||||
## Project-wide compilation flags
|
||||
set(COMMON_FLAGS "-mavx -Wall -Wextra -Werror -Wdouble-promotion -Wfloat-conversion -Wshadow")
|
||||
set(COMMON_FLAGS "-mavx -DOMPI_SKIP_MPICXX -Wall -Wextra -Werror -Wdouble-promotion -Wfloat-conversion -Wshadow") # -DOMPI_SKIP_MPICXX is to force OpenMPI to use the C interface
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}")
|
||||
set(CMAKE_C_STANDARD 11)
|
||||
@@ -78,8 +78,8 @@ if (DOUBLE_PRECISION)
|
||||
add_definitions(-DAC_DOUBLE_PRECISION=1)
|
||||
endif ()
|
||||
if (MPI_ENABLED)
|
||||
find_package(MPI REQUIRED)
|
||||
include_directories(${MPI_CXX_INCLUDE_DIRS})
|
||||
find_package(MPI REQUIRED COMPONENTS C)
|
||||
include_directories(${MPI_C_INCLUDE_DIRS})
|
||||
add_definitions(-DAC_MPI_ENABLED=1)
|
||||
endif ()
|
||||
if (MULTIGPU_ENABLED)
|
||||
|
Reference in New Issue
Block a user