Преглед изворни кода

Merge topic 'try_compile-cross-app-bundles'

81549baff4 try_compile: Fix COPY_FILE with app-bundles on non-macOS hosts

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Merge-request: !7377
Brad King пре 3 година
родитељ
комит
6940a67d47
1 измењених фајлова са 3 додато и 2 уклоњено
  1. 3 2
      Source/cmCoreTryCompile.cxx

+ 3 - 2
Source/cmCoreTryCompile.cxx

@@ -1126,7 +1126,8 @@ void cmCoreTryCompile::FindOutputFile(const std::string& targetName,
     searchDirs.emplace_back(std::move(tmp));
   }
   searchDirs.emplace_back("/Debug");
-#if defined(__APPLE__)
+
+  // handle app-bundles (for targeting apple-platforms)
   std::string app = "/" + targetName + ".app";
   if (cmNonempty(config)) {
     std::string tmp = cmStrCat('/', *config, app);
@@ -1135,7 +1136,7 @@ void cmCoreTryCompile::FindOutputFile(const std::string& targetName,
   std::string tmp = "/Debug" + app;
   searchDirs.emplace_back(std::move(tmp));
   searchDirs.emplace_back(std::move(app));
-#endif
+
   searchDirs.emplace_back("/Development");
 
   for (std::string const& sdir : searchDirs) {