Comment 9 for bug 1793329

I would be willing to accept your second patch as long as we do some due diligence and thoroughly test this on every build platform we support to make sure it doesn't cause grief elsewhere. Also, please note the coding style of the cmake file you are modifying. While we do not have an official cmake coding policy, our cmake files try to follow the c coding policy as closely as possible.