updated cmake lists accordingly # Conflicts: # CMakeLists.txt Former-commit-id: f51dfbb591
f51dfbb591