Pulled latest cmake modules

And fixed dbg_test to include correct header