CMake build refined