fixed cmake compilation on linux
Merge pull request #666 from tdev/cmake_linux_fixes

CMake linux fixes