CMake small modernization

11 jobs for master in 24 minutes and 42 seconds (queued for 3 seconds)