Minor changes on cmake files to improve the performance using the GUI
configuration