Add guard to protect against importing library targets twice.
Merge branch 'garth/fix-cmake-3-issues' into next