Using new CMake architecture (again...)