From c4686e89811d610aaaf2a8f04b22ae804c7bb24c Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 26 Apr 2019 11:51:15 +0200
Subject: [PATCH] [CMake] Added note on utils + mpi incompatibility.
---
CMakeLists.txt | 5 +++++
Jenkinsfile | 1 -
...iscourse-news.js_d11fe7b62c27961c87ecd0f2490357b9.content | 4 ++--
.../discourse-news.js_d11fe7b62c27961c87ecd0f2490357b9.json | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e5312921eb..3448b141bad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,6 +97,11 @@ if(OGS_BUILD_GUI)
option(OGS_USE_NETCDF "Add NetCDF support." ON)
endif()
option(OGS_BUILD_UTILS "Should the utilities programms be built?" OFF)
+if(OGS_BUILD_UTILS AND OGS_USE_MPI)
+ message(WARNING "OGS_BUILD_UTILS cannot be used with OGS_USE_MPI "
+ "(OGS_USE_PETSC)! Disabling OGS_BUILD_UTILS.")
+ set(OGS_BUILD_UTILS OFF CACHE BOOL "" FORCE)
+endif()
# A list of processes to be build. Also used in the ProcessLib to select
diff --git a/Jenkinsfile b/Jenkinsfile
index 1bd9d684a9e..8d7571ca51f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -316,7 +316,6 @@ pipeline {
configure {
sh 'git submodule sync'
cmakeOptions =
- '-DOGS_BUILD_UTILS=ON ' +
'-DBUILD_SHARED_LIBS=ON ' +
'-DOGS_USE_PETSC=ON ' +
'-DOGS_USE_CONAN=OFF '
diff --git a/web/resources/_gen/assets/js/js/discourse-news.js_d11fe7b62c27961c87ecd0f2490357b9.content b/web/resources/_gen/assets/js/js/discourse-news.js_d11fe7b62c27961c87ecd0f2490357b9.content
index ec4a82ad985..72fb3df6e1f 100644
--- a/web/resources/_gen/assets/js/js/discourse-news.js_d11fe7b62c27961c87ecd0f2490357b9.content
+++ b/web/resources/_gen/assets/js/js/discourse-news.js_d11fe7b62c27961c87ecd0f2490357b9.content
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:cacae8c57407dd54e8733f210faa28d400391fae027f681ed52862a08a3b56c1
-size 739
+oid sha256:4a3c5fdaa75da014d56ed6f42fd84e51698974c7369f778bb2ce78fb6462e43a
+size 740
diff --git a/web/resources/_gen/assets/js/js/discourse-news.js_d11fe7b62c27961c87ecd0f2490357b9.json b/web/resources/_gen/assets/js/js/discourse-news.js_d11fe7b62c27961c87ecd0f2490357b9.json
index 66da870a83f..485e379a326 100644
--- a/web/resources/_gen/assets/js/js/discourse-news.js_d11fe7b62c27961c87ecd0f2490357b9.json
+++ b/web/resources/_gen/assets/js/js/discourse-news.js_d11fe7b62c27961c87ecd0f2490357b9.json
@@ -1 +1 @@
-{"Target":"js/discourse-news.min.cacae8c57407dd54e8733f210faa28d400391fae027f681ed52862a08a3b56c1.js","MediaType":"application/javascript","Data":{"Integrity":"sha256-ysroxXQH3VTocz8hD6oo1AA5H64Cf2ge1ShioIo7VsE="}}
\ No newline at end of file
+{"Target":"js/discourse-news.min.4a3c5fdaa75da014d56ed6f42fd84e51698974c7369f778bb2ce78fb6462e43a.js","MediaType":"application/javascript","Data":{"Integrity":"sha256-Sjxf2qddoBTVbtb0L9hOUWmJdMc2n3eLss54+2Ri5Do="}}
\ No newline at end of file
--
GitLab