From 361068fd370b38047d107108819b561a15adcf1d Mon Sep 17 00:00:00 2001
From: Dominik Thoennes <dominik.thoennes@fau.de>
Date: Mon, 13 Sep 2021 15:39:57 +0200
Subject: [PATCH] remove allow-run-as-root in MPIEXEC_PREFLAGS it is handled
via the environment variables in the docker images check for intelclang or
clang before checking for OpenMP bug
---
.gitlab-ci.yml | 1 -
CMakeLists.txt | 14 ++++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 191484b09..84deb9e58 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,6 @@ stages:
- export CCACHE_BASEDIR=$CI_PROJECT_DIR
- mkdir $CI_PROJECT_DIR/build
- cd $CI_PROJECT_DIR/build
- - if dpkg --compare-versions `ompi_info | head -2 | tail -1 | sed 's/[^0-9.]*\([0-9.]*\).*/\1/'` ge 1.10; then export MPIEXEC_PREFLAGS="--allow-run-as-root" ; fi
- cmake ..
-DWALBERLA_BUFFER_DEBUG=$WALBERLA_BUFFER_DEBUG
-DWALBERLA_BUILD_TESTS=ON
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1a0bb29f..e767f4498 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1034,12 +1034,14 @@ if ( WALBERLA_BUILD_WITH_OPENMP )
endif()
endif()
- # check for bug in combination with OpenMP and sign conversion https://bugs.llvm.org/show_bug.cgi?id=48387
- try_compile( WALBERLA_CLANG_OPENMP_BUG "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/TestClangOpenMPBug.cpp"
- COMPILE_DEFINITIONS -Werror)
- if ( NOT ${WALBERLA_CLANG_OPENMP_BUG} )
- message(WARNING "Setting -Wno-sign-conversion due to a compiler bug in LLVM (https://bugs.llvm.org/show_bug.cgi?id=48387)" )
- add_flag ( CMAKE_CXX_FLAGS "-Wno-sign-conversion" )
+ if( CMAKE_CXX_COMPILER_ID MATCHES Clang OR CMAKE_CXX_COMPILER_ID MATCHES IntelLLVM )
+ # check for bug in combination with OpenMP and sign conversion https://bugs.llvm.org/show_bug.cgi?id=48387
+ try_compile( WALBERLA_CLANG_OPENMP_BUG "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/TestClangOpenMPBug.cpp"
+ COMPILE_DEFINITIONS -Werror )
+ if( NOT ${WALBERLA_CLANG_OPENMP_BUG} )
+ message( WARNING "Setting -Wno-sign-conversion due to a compiler bug in LLVM (https://bugs.llvm.org/show_bug.cgi?id=48387)" )
+ add_flag( CMAKE_CXX_FLAGS "-Wno-sign-conversion" )
+ endif()
endif()
else()
--
GitLab