From cc471e9d4ec05db86da3ff818d1268e8a8148b9b Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 9 Jan 2018 13:17:02 +0100
Subject: [PATCH] [Jenkins] Use ninja in sanitizer job.
---
Jenkinsfile | 10 ++--------
scripts/cmake/ConanSetup.cmake | 4 ++++
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 10011943f6b..981fdf0aaf5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -370,18 +370,12 @@ pipeline {
'-DOGS_BUILD_UTILS=ON '
}
try {
- build {
- target = 'test'
- cmd = 'UBSAN_OPTIONS=print_stacktrace=1 make -j $(nproc)'
- }
+ build { cmd = 'UBSAN_OPTIONS=print_stacktrace=1 ninja test' }
}
catch(err) { echo "Clang sanitizer for unit tests failed!" }
try {
- build {
- target = 'ctest'
- cmd = 'UBSAN_OPTIONS=print_stacktrace=1 make -j $(nproc)'
- }
+ build { cmd = 'UBSAN_OPTIONS=print_stacktrace=1 ninja ctest' }
}
catch(err) { echo "Clang sanitizer for end-to-end tests failed!" }
}
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index 908f815513d..acaf2c5875e 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -32,6 +32,10 @@ if(LINUX AND BUILD_SHARED_LIBS)
set(CONAN_OPTIONS ${CONAN_OPTIONS} VTK:fPIC=True)
endif()
+if(OGS_USE_MPI)
+ set(CONAN_OPTIONS ${CONAN_OPTIONS} VTK:mpi=True)
+endif()
+
if(OGS_BUILD_GUI)
set(CONAN_REQUIRES ${CONAN_REQUIRES}
Shapelib/1.3.0@bilke/stable
--
GitLab