فهرست منبع

Merge topic 'normalize-input-paths'

fc5584f9bb cmSystemTools: Fix regression in input path normalization on Windows

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Merge-request: !10440
Brad King 9 ماه پیش
والد
کامیت
c4f8b13845
1فایلهای تغییر یافته به همراه5 افزوده شده و 0 حذف شده
  1. 5 0
      Source/cmSystemTools.cxx

+ 5 - 0
Source/cmSystemTools.cxx

@@ -1991,8 +1991,13 @@ std::vector<std::string> cmSystemTools::SplitEnvPathNormalized(
 std::string cmSystemTools::ToNormalizedPathOnDisk(std::string p)
 std::string cmSystemTools::ToNormalizedPathOnDisk(std::string p)
 {
 {
   using namespace cm::PathResolver;
   using namespace cm::PathResolver;
+#ifdef _WIN32
+  // IWYU pragma: no_forward_declare cm::PathResolver::Policies::CasePath
+  static Resolver<Policies::CasePath> const resolver(RealOS);
+#else
   // IWYU pragma: no_forward_declare cm::PathResolver::Policies::LogicalPath
   // IWYU pragma: no_forward_declare cm::PathResolver::Policies::LogicalPath
   static Resolver<Policies::LogicalPath> const resolver(RealOS);
   static Resolver<Policies::LogicalPath> const resolver(RealOS);
+#endif
   resolver.Resolve(std::move(p), p);
   resolver.Resolve(std::move(p), p);
   return p;
   return p;
 }
 }