From a1663277c76e8d814a745a596f864c2e1fdd9080 Mon Sep 17 00:00:00 2001
From: Krishna Vedala <krishna.vedala@ieee.org>
Date: Mon, 25 May 2020 22:51:18 -0400
Subject: [PATCH] cherry pick changes from "cmake branch"