Modular building and linux fixes
Merge branch 'cmake_changes' of github.com:louispvb/NoLifeStory into cmake_changes

merge