Removed and moved compiler options
merged CMakeLists