CMakeLists.txt fix, cmake find modules added

Several style changes