Maded some changes to CMakeLists