changed CMake
added all changes