Some modifications in cmake file