Updated CMake file
Merge remote-tracking branch 'origin/use_cmake2' into next

* origin/use_cmake2:
  Updated CMake file