updating cmake for wrling environment + compilation flags
merging conflicts