minor adaptions for cmake
Merge pull request #210 from simonlynen/fix/cmake

Adaptions for cmake