Updated CMake file
Re-added setdiff as an option
Defenses against degenerate input