Merge pull request #2865 from BioDataAnalysis/emmenlau_minor_clangcl_improvement

Separated MSVC and clang-cl settings for Windows