CMake 2.6 merge

I have tested with CMake 2.6 and is possible. I think the minor versions we have the bettr?