fix make install, when using CMake
see Issue #41
fix CMake build
w
Merge remote-tracking branch 'upstream/master'