Update FindImageMagick to work with v7

Robert Daileyrequested to merge
rcdailey/cmake:master into master

FindImageMagick was not working with v7 of the library installed on Ubuntu. These changes make it work.

Topic-rename: FindImageMagick-support-v7

Merge request reports