Changes in cmake
Merge from AddMultiplatform