More fixes for cmake 2.8.7