improve robustness of cmake targets

As note as a catalyst issue some failures if WM_OSTYPE is not set.

Transfer some of the configuration setup from there.