modified CMakeLists.txt and pcakge.xml