Changes in cmake