(temp) apply cmake changes from Guillermo Sais <guillermo.sais@gmail.com>