Remove extra ExternalProject include in CMakeLists.txt and pull in update CMake modules.