Merge pull request #1259 from isuruf/cmake