Merge pull request #1682 from dakotahawkins/improve-exported-targets

Improve CMake exported targets