Adding fixed CMakeLists.txt file as well, changes by a-kulbei