CMakeLists.txt fixes
Merge pull request #1 from sarum9in/master

CMakeLists.txt fixes