From 8cdb4df8f6b2b93af62ae931f75730741de68b62 Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Wed, 30 Jun 2021 12:04:51 +0200
Subject: ci: Enable custom CXX flags, enable -Werror

- Add a new boolean to make and ninja builds (uhdAllowWarnings). It
  defaults to false.
- When asserted, we set build flags for make and ninja to

    -Werror -Wno-error=maybe-uninitialized

- Add a new parameter to make and ninja builds (uhdCxxFlags). It is
  currently unused
---
 .ci/templates/steps-build-uhd-make.yml  | 11 +++++++++++
 .ci/templates/steps-build-uhd-ninja.yml | 11 +++++++++++
 2 files changed, 22 insertions(+)

(limited to '.ci/templates')

diff --git a/.ci/templates/steps-build-uhd-make.yml b/.ci/templates/steps-build-uhd-make.yml
index cc0d491e8..7073447af 100644
--- a/.ci/templates/steps-build-uhd-make.yml
+++ b/.ci/templates/steps-build-uhd-make.yml
@@ -6,6 +6,12 @@ parameters:
 - name: uhdEnableTraceLog
   type: boolean
   default: false
+- name: uhdAllowWarnings
+  type: boolean
+  default: false
+- name: uhdCxxFlags
+  type: string
+  default: ""
 
 steps:
 - script: |
@@ -15,6 +21,11 @@ steps:
       echo "Enabling UHD Tracing"
       export UHD_CI_CMAKE_OPTIONS="-DUHD_LOG_MIN_LEVEL=trace $UHD_CI_CMAKE_OPTIONS"
     fi
+    if [[ "${{ parameters.uhdAllowWarnings }}" = "False" ]]; then
+      echo "Warnings not allowed for this build."
+      export CXXFLAGS="-Werror -Wno-error=maybe-uninitialized $CXXFLAGS"
+    fi
+    export CXXFLAGS="${{ parameters.uhdCxxFlags }} $CXXFLAGS"
     cmake \
       $UHD_CI_CMAKE_OPTIONS \
       ${{ parameters.uhdSrcDir }}/host
diff --git a/.ci/templates/steps-build-uhd-ninja.yml b/.ci/templates/steps-build-uhd-ninja.yml
index f3ee6cfaa..48b0a424d 100644
--- a/.ci/templates/steps-build-uhd-ninja.yml
+++ b/.ci/templates/steps-build-uhd-ninja.yml
@@ -3,11 +3,22 @@ parameters:
   type: string
 - name: uhdBuildDir
   type: string
+- name: uhdAllowWarnings
+  type: boolean
+  default: false
+- name: uhdCxxFlags
+  type: string
+  default: ""
 
 steps:
 - script: |
     mkdir -p ${{ parameters.uhdBuildDir }}
     cd ${{ parameters.uhdBuildDir }}
+    if [[ "${{ parameters.uhdAllowWarnings }}" = "False" ]]; then
+      echo "Warnings not allowed for this build."
+      export CXXFLAGS="-Werror -Wno-error=maybe-uninitialized $CXXFLAGS"
+    fi
+    export CXXFLAGS="${{ parameters.uhdCxxFlags }} $CXXFLAGS"
     cmake -G Ninja ${{ parameters.uhdSrcDir }}/host
   displayName: cmake ninja UHD
 - script: |
-- 
cgit v1.2.3