Fixed discus CMakeLists to allow merge into master.