Changed cmake file
Merge branch 'cmake_test' of github.com:kbladin/Modeling-project into cmake_test