Updated to latest CMake tree.
Merge pull request #5 from rdumusc/subtree

Updated to latest CMake tree.