More CMake rework