Revert that cmake macro stuff that has been causing grieph since August

Once a proper solution is found, things like this can be re-attempted,
but for now we need a solution to move forward with newer cmake versions
for zlib 1.3 compatibility