Updates to CMake settings for better compiler support.