Issue #44: More fiddling with Windows build.
Issue #44: More fiddling with Windows build.

MattClarkson/CMakeCatchTemplate,MattClarkson/CMakeCatchTemplate,MattClarkson/CMakeCatchTemplate,MattClarkson/CMakeCatchTemplate