Merge pull request #85 from mgalimullin/fix_cmakelists