diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-06 13:25:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-05-06 13:25:53 (GMT) |
| commit | 2951d711114d35b7538bf91e38128ea2864772ba (patch) | |
| tree | 378857f14a4ed881d74fc72ae63cf8c02ab59910 | |
| parent | 463e20c5c6a5c23aeedbe6cf5d163592e783a6d7 (diff) | |
| parent | 275b6b3194e09a77247dc863ad5259cee316d6dc (diff) | |
| download | CMake-2951d711114d35b7538bf91e38128ea2864772ba.zip CMake-2951d711114d35b7538bf91e38128ea2864772ba.tar.gz CMake-2951d711114d35b7538bf91e38128ea2864772ba.tar.bz2 | |
Merge branch 'fix_ios_try_compile' into release-3.14
Merge-request: !3272
| -rw-r--r-- | Source/cmCoreTryCompile.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index 3892011..037d415 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -1040,7 +1040,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"); |