main cmake file fixed for use with toolchain file, include fixed in saturation block test

(cherry picked from commit 44d5b2cd43cd42cb1ab8663a5318563e4268a9a0)

Conflicts:
	CMakeLists.txt