Browse Source

Merge topic 'fix_ios_try_compile'

275b6b3194 iOS: Fix try_compile FILE_COPY not to fail

Acked-by: Kitware Robot <[email protected]>
Merge-request: !3272
Brad King 6 years ago
parent
commit
f0185ff14a
1 changed files with 8 additions and 1 deletions
  1. 8 1
      Source/cmCoreTryCompile.cxx

+ 8 - 1
Source/cmCoreTryCompile.cxx

@@ -1052,7 +1052,14 @@ void cmCoreTryCompile::FindOutputFile(const std::string& targetName,
   }
   searchDirs.emplace_back("/Debug");
 #if defined(__APPLE__)
-  std::string app = "/Debug/" + targetName + ".app";
+  std::string app = "/" + targetName + ".app";
+  if (config && config[0]) {
+    std::string tmp = "/";
+    tmp += config + app;
+    searchDirs.push_back(std::move(tmp));
+  }
+  std::string tmp = "/Debug" + app;
+  searchDirs.emplace_back(std::move(tmp));
   searchDirs.push_back(std::move(app));
 #endif
   searchDirs.emplace_back("/Development");