CMake
Merge branch 'portability' into cmake