CMake simplification