CMAKE: Altered some if-tests to use variable names without $\{\} as cmake 2.6 seems to like that better