Fixed string var expansion in CMake due to CMP0053

CMake policy 0053 means they are deprecating the usage of
@VAR@ in CMakefiles, so CMake-3.0.2 has started to
issue big warnings about this. Replace them with ${VAR}.

Change-Id: I4e63a4eb038edbc27019bfb89c7106e97aa194c2