Merge pull request #4370 from 2xsaiko/outgoing/cmake-now-for-real Re-do and clean up CMake support, making it use relocatable paths