CMakeLists fix for gtest
Merge remote-tracking branch 'origin/master'
segment.h fix