From de7f4e168d06695a9eb43f395d5ec5053baa4f1a Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 17 Jan 2018 15:26:26 +0100 Subject: [PATCH 1/2] fixed: we need to do mpi disabling earlier if not, prereqs do not see this file, and the option ends up not being operational for prereqs looking for MPI. --- cmake/Modules/OpmInit.cmake | 7 +++++++ cmake/Modules/OpmLibMain.cmake | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cmake/Modules/OpmInit.cmake b/cmake/Modules/OpmInit.cmake index 832862be6..12da42a6d 100644 --- a/cmake/Modules/OpmInit.cmake +++ b/cmake/Modules/OpmInit.cmake @@ -74,3 +74,10 @@ if (USE_VERSIONED_DIR) else () set (${project}_VER_DIR "") endif () + +# parallel computing must be explicitly enabled +# This needs to be in OpmInit as prereqs is called before OpmLibMain is included. +option (USE_MPI "Use Message Passing Interface for parallel computing" OFF) +if (NOT USE_MPI) + set (CMAKE_DISABLE_FIND_PACKAGE_MPI TRUE) +endif () diff --git a/cmake/Modules/OpmLibMain.cmake b/cmake/Modules/OpmLibMain.cmake index 443c95d77..0e0c5fb0c 100644 --- a/cmake/Modules/OpmLibMain.cmake +++ b/cmake/Modules/OpmLibMain.cmake @@ -90,12 +90,6 @@ include (UseOptimization) # dependencies, in case they alter the list of warnings include (UseWarnings) -# parallel computing must be explicitly enabled -option (USE_MPI "Use Message Passing Interface for parallel computing" OFF) -if (NOT USE_MPI) - set (CMAKE_DISABLE_FIND_PACKAGE_MPI TRUE) -endif (NOT USE_MPI) - # parallel programming include (UseOpenMP) find_openmp (${project}) From 4340691ff87a60384a87d141aa29fcfc4086dd97 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 17 Jan 2018 15:56:57 +0100 Subject: [PATCH 2/2] added: handle QuadMath support like MPI --- cmake/Modules/OpmInit.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmake/Modules/OpmInit.cmake b/cmake/Modules/OpmInit.cmake index 12da42a6d..e0f8b93dc 100644 --- a/cmake/Modules/OpmInit.cmake +++ b/cmake/Modules/OpmInit.cmake @@ -81,3 +81,10 @@ option (USE_MPI "Use Message Passing Interface for parallel computing" OFF) if (NOT USE_MPI) set (CMAKE_DISABLE_FIND_PACKAGE_MPI TRUE) endif () + +# quadmath must be explicitly enabled +# This needs to be in OpmInit as prereqs is called before OpmLibMain is included. +option (USE_QUADMATH "Use high precision floating point library (slow)" OFF) +if (NOT USE_QUADMATH) + set (CMAKE_DISABLE_FIND_PACKAGE_QuadMath TRUE) +endif ()