I remember that I changed it in my first PR concerning to the cmake. Can we do it in another PR specially for this issue?