diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e5312921ebe1b18d2530291a1387301e2abb6f6..3448b141bad5c4daac66de449359280a8d08f0a9 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 1bd9d684a9ea859a641c4570b33b18605f9b1698..8d7571ca51fd55cc4859addd77b536fd2daec3c8 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 ec4a82ad985e6955e4eb5daece52cdcfdc39df90..72fb3df6e1ffb5768234ef20c59d2319b84d4f4f 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 66da870a83f63143a96c4020ca94754330b6ef18..485e379a326a72b80e27d9376a20cf8e8b23b333 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