fixed unix tests
Merge branch 'devel' of https://github.com/toeb/oo-cmake into devel