modified cmake structure