Let CMake rely on data's CMakeLists.txt if it exists

- Also update data to latest 'dev', where the CMakeLists exists

Also revert my wrong fix to CMake paths definitions; it was clearly wrong, sorry.