diff --git a/Jenkinsfile b/Jenkinsfile index 10011943f6b8bd6ff33e8431dc8437888646dac1..981fdf0aaf58ebc9ea7da73e300e3f89d3f61e6b 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 908f815513da08367a9b45dea3f17c5d9f2af0d4..acaf2c5875e285789282416d3691e4f6c4c0da0b 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