Merge pull request #566 from redagito/master

CMake fix for static library only build