From 613884ec3e3de15eb3fba020f83da5d95e8d731b Mon Sep 17 00:00:00 2001
From: acrovato <a.crovato@uliege.be>
Date: Fri, 18 Sep 2020 16:35:57 +0200
Subject: [PATCH] Update CI. Add msys2 cfg
---
.gitlab-ci.yml | 4 ++++
CMake/msys2.cmake | 17 +++++++++++++++++
2 files changed, 21 insertions(+)
create mode 100644 CMake/msys2.cmake
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16a42cd..210887c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,10 @@ default:
- source /opt/intel/mkl/bin/mklvars.sh intel64
- source /opt/intel/tbb/bin/tbbvars.sh intel64
+.global_tag: &global_tag_def
+ tags:
+ - mn2l
+
stages:
- build
- test
diff --git a/CMake/msys2.cmake b/CMake/msys2.cmake
new file mode 100644
index 0000000..4208982
--- /dev/null
+++ b/CMake/msys2.cmake
@@ -0,0 +1,17 @@
+# Copyright 2020 University of Liège
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# MSYS2 with MinGW (AC)
+
+SET(CMAKE_GENERATOR "MSYS Makefiles" CACHE INTERNAL "" FORCE)
--
GitLab