Updated to match changed CMake functions.
Merge branch 'next' of github.com:maidsafe/MaidSafe-Routing into next