Merge pull request #223 from est77/est

Small CMake related improvements.
small code simplification.
Merge branch 'master' of github.com:jupiter-jazz/appleseed