Modified CMakeLists.txt to allow latest cmake to work