And clean up the nested variable names, in order to make it readable. This commit was SVN r20498.
CMakeLists and .windows files. In contribs preconfigured and precompiled parts. This commit was SVN r20108.