CMakeLists edits to fix compilation with gcc 4.6