From 18521f4873d0c1772c90cb820160d90a3ab512b7 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 16 Apr 2020 21:30:39 +0200
Subject: [PATCH] [Jenkins] Enable Unity builds.
---
.../DataView/DiagramView/GetDateTime.h | 2 ++
Jenkinsfile | 24 ++++++++++++-------
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/Applications/DataExplorer/DataView/DiagramView/GetDateTime.h b/Applications/DataExplorer/DataView/DiagramView/GetDateTime.h
index fe9034a75d1..4d769d85292 100644
--- a/Applications/DataExplorer/DataView/DiagramView/GetDateTime.h
+++ b/Applications/DataExplorer/DataView/DiagramView/GetDateTime.h
@@ -8,6 +8,8 @@
*
*/
+#pragma once
+
#include <QDateTime>
#include <QString>
#include <string>
diff --git a/Jenkinsfile b/Jenkinsfile
index 94f403ae77c..e1e93a03fe8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -115,7 +115,8 @@ pipeline {
'-DOGS_CONAN_BUILD=missing ' +
'-DOGS_USE_CVODE=ON ' +
'-DOGS_USE_MFRONT=ON ' +
- '-DOGS_USE_PYTHON=ON '
+ '-DOGS_USE_PYTHON=ON ' +
+ '-DOGS_USE_UNITY_BUILDS=ON '
}
// Workaround some MGIS CMake logic flaws
configure {
@@ -201,7 +202,8 @@ pipeline {
'-DOGS_BUILD_UTILS=ON ' +
'-DOGS_CONAN_BUILD=missing ' +
'-DOGS_BUILD_TESTS=OFF ' +
- '-DOGS_USE_NETCDF=ON '
+ '-DOGS_USE_NETCDF=ON ' +
+ '-DOGS_USE_UNITY_BUILDS=ON '
}
build {
target="package"
@@ -257,7 +259,8 @@ pipeline {
"-DBUILD_SHARED_LIBS=${build_shared} " +
'-DOGS_CONAN_BUILD=missing ' +
'-DOGS_CONAN_BUILD_TYPE=Release ' +
- '-DOGS_CPU_ARCHITECTURE=generic '
+ '-DOGS_CPU_ARCHITECTURE=generic ' +
+ '-DOGS_USE_UNITY_BUILDS=ON '
config = 'Debug'
}
build { }
@@ -290,7 +293,8 @@ pipeline {
'-DBUILD_SHARED_LIBS=ON ' +
'-DOGS_CPU_ARCHITECTURE=sandybridge ' +
'-DCMAKE_INSTALL_PREFIX=/global/apps/ogs/head/standard ' +
- '-DOGS_MODULEFILE=/global/apps/modulefiles/ogs/head/standard '
+ '-DOGS_MODULEFILE=/global/apps/modulefiles/ogs/head/standard ' +
+ '-DOGS_USE_UNITY_BUILDS=ON '
env = 'eve/cli.sh'
}
build {
@@ -346,7 +350,8 @@ pipeline {
'-DBUILD_SHARED_LIBS=ON ' +
'-DOGS_CPU_ARCHITECTURE=sandybridge ' +
'-DCMAKE_INSTALL_PREFIX=/global/apps/ogs/head/petsc ' +
- '-DOGS_MODULEFILE=/global/apps/modulefiles/ogs/head/petsc '
+ '-DOGS_MODULEFILE=/global/apps/modulefiles/ogs/head/petsc ' +
+ '-DOGS_USE_UNITY_BUILDS=ON '
env = 'eve/petsc.sh'
}
build {
@@ -409,7 +414,8 @@ pipeline {
'-DOGS_BUILD_UTILS=ON ' +
'-DOGS_CONAN_BUILD=missing ' +
'-DOGS_BUILD_SWMM=ON ' +
- '-DOGS_USE_NETCDF=ON '
+ '-DOGS_USE_NETCDF=ON ' +
+ '-DOGS_USE_UNITY_BUILDS=ON '
}
build {
target="package"
@@ -464,7 +470,8 @@ pipeline {
'-DOGS_CPU_ARCHITECTURE=core2 ' +
'-DOGS_BUILD_UTILS=ON ' +
'-DOGS_CONAN_BUILD=missing ' +
- '-DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" '
+ '-DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" ' +
+ '-DOGS_USE_UNITY_BUILDS=ON '
}
build {
target="package"
@@ -512,7 +519,8 @@ pipeline {
'-DOGS_BUILD_GUI=ON ' +
'-DOGS_USE_CONAN=OFF ' +
'-DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" ' +
- '-DOGS_USE_NETCDF=ON '
+ '-DOGS_USE_NETCDF=ON ' +
+ '-DOGS_USE_UNITY_BUILDS=ON '
}
build {
target="package"
--
GitLab