additions for CMake + Travis-CI