Merge pull request #59 from gsomlo/gls-cmake-fixes-v0

Additional libtrellis cmake fixes