diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-06 13:32:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-05-06 13:32:25 (GMT) |
| commit | f0185ff14a1c25dc603e207fbf3cc73457c5990c (patch) | |
| tree | fda10a65f7489b5ca0e2df6fc47f8c3d3b75a58e /Source | |
| parent | 1820c7e780e827a509a340835229d7075f5d1d1e (diff) | |
| parent | 275b6b3194e09a77247dc863ad5259cee316d6dc (diff) | |
| download | CMake-f0185ff14a1c25dc603e207fbf3cc73457c5990c.zip CMake-f0185ff14a1c25dc603e207fbf3cc73457c5990c.tar.gz CMake-f0185ff14a1c25dc603e207fbf3cc73457c5990c.tar.bz2 | |
Merge topic 'fix_ios_try_compile'
275b6b3194 iOS: Fix try_compile FILE_COPY not to fail
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3272
Diffstat (limited to 'Source')
| -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 897f7a8..2f62db1 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/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"); |