Merge pull request #216 from DerDakon/cmake-cleanup

CMake: simplify code