This PR is about CMake. It is not suitable to mix changes in the Makefile.