Fix compilation with g++-4.8 + better Cmake