From 1ef08d29cf764725518b9c2ec9fc83601e1e7590 Mon Sep 17 00:00:00 2001
From: Martin Beseda <martin.beseda@vsb.cz>
Date: Tue, 22 Oct 2019 00:23:20 +0200
Subject: [PATCH] [WIP] [FIX] [Win] Trying to fix compilation with MS-MPI.
---
CMakeLists.txt | 2 ++
src/CMakeLists.txt | 1 +
2 files changed, 3 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f3799d5..d81c99b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,7 @@ set(MPIEXEC "C:/Program Files/Microsoft MPI/Bin/mpiexec.exe")
# So there is no need to set a specific MPI compiler.
#set(MPI_CXX_COMPILER "${CMAKE_CXX_COMPILER}")
set(MPI_CXX_INCLUDE_PATH "C:/Program Files (x86)/Microsoft SDKs/MPI/Include")
+set(MPI_CXX_INCLUDE_DIRS "C:/Program Files (x86)/Microsoft SDKs/MPI/Include")
# Make sure the correct libraries (64-bit or 32-bit) are selected.
# Decide between 32-bit and 64-bit libraries for Microsoft's MPI
if("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
@@ -32,6 +33,7 @@ endif()
set(MPI_CXX_LIBRARIES "C:/Program Files (x86)/Microsoft SDKs/MPI/Lib/${MS_MPI_ARCH_DIR}/msmpi.lib")
set(MPI_C_INCLUDE_PATH "${MPI_CXX_INCLUDE_PATH}")
+set(MPI_C_INCLUDE_DIRS "${MPI_CXX_INCLUDE_DIRS}")
set(MPI_C_LIBRARIES "{${MPI_CXX_LIBRARIES}")
set(MPIEXEC_NUMPROC_FLAG "-np" CACHE STRING "Flag used by MPI to specify
the number of processes for MPIEXEC; the next option will be the number of
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cb7a9eab..735e65bf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -167,6 +167,7 @@ IF("${BUILD_LIB}" STREQUAL "yes")
${SRC_DIR}
${Boost_INCLUDE_DIRS}
${ARMADILLO_INCLUDE_DIR}
+ ${MPI_CXX_INCLUDE_DIRS}
)
SET_TARGET_PROPERTIES(
--
GitLab