Merge branch...

Merge branch '264-change-cmakelists-txt-to-closer-match-visualstudio-dependency-structure' into 'main'

Resolve "Change CMakeLists.txt to closer match VisualStudio dependency structure"

See merge request !361