From 00c738968d98e0e227640c1dab5f5e05341c3b14 Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Tue, 21 Oct 2014 10:05:12 +0200
Subject: [PATCH] Change one option for cmake.
---
CMakeLists.txt | 16 +++++++++++-----
scripts/cmake/Find.cmake | 7 ++-----
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e03717de42b..4f63552715b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,18 +117,24 @@ INCLUDE_DIRECTORIES( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/gtest/include
INCLUDE_DIRECTORIES( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/quickcheck )
INCLUDE_DIRECTORIES( SYSTEM ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/zlib )
+# Use MPI
+IF(OGS_USE_MPI)
+ IF(WIN32)
+ ADD_DEFINITIONS(/DUSE_MPI)
+ ELSE()
+ ADD_DEFINITIONS(-DUSE_MPI)
+ ENDIF()
+ENDIF()
+
IF(OGS_USE_LIS)
ADD_DEFINITIONS(-DUSE_LIS)
INCLUDE_DIRECTORIES(SYSTEM ${LIS_INCLUDE_DIR})
ENDIF()
+# Use PETSc package for global assembly and linear sover for parallel computing
IF(OGS_USE_PETSC)
ADD_DEFINITIONS(-DUSE_PETSC)
- ADD_DEFINITIONS(-DUSE_MPI)
-ENDIF()
-
-IF(OGS_USE_MPI)
- ADD_DEFINITIONS(-DUSE_MPI)
+ SET(OGS_USE_MPI ON)
ENDIF()
IF(OGS_USE_EIGEN)
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 9a68e213ed6..b6cd99a30eb 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -117,11 +117,8 @@ IF(OGS_USE_LIS)
ENDIF()
## Check MPI package
-IF(OGS_USE_PETSC OR OGS_USE_MPI)
- FIND_PACKAGE(MPI)
- IF(NOT MPI_FOUND)
- MESSAGE(FATAL_ERROR "MPI is required but was not found!")
- ENDIF()
+IF(OGS_USE_MPI)
+ FIND_PACKAGE(MPI REQUIRED)
ENDIF()
IF(OGS_USE_PETSC)
--
GitLab