Merge Dave's changes back into my branch master. Fixes CMake file syntax updates.
Pipeline #1246798 passed
Pipeline passed for 980a4fd7 on master-update 5 years ago
Merge details
Pipeline #1246826 passed
Pipeline passed for 54c2ee95 on master 5 years ago
merged
mentioned in commit 54c2ee95