Updated cmakelists for external libs