Updated CMakeLists for compatilibity with other distributions