Remove duplicate entries from CMake build files
Merge pull request #1199 from simonsonc/cmake-cleanup-dups

Remove duplicate entries from CMake build files