Smarter cmake files
Merge remote-tracking branch 'upstream/master' into personal

merging upstream
Merge pull request #20 from louispvb/cmake_changes

Cmake changes