Revert "Revert "Update Cmakelists""

This reverts commit bb44519031388ad7a786cace2df37464d2e5fd8b.