diff options
| author | Brad King <brad.king@kitware.com> | 2022-06-17 15:31:08 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-06-17 15:31:38 (GMT) |
| commit | 6940a67d479e722521a3f84d816858b860d09e71 (patch) | |
| tree | d192758dcd7cb035f67c388c4eecb1672453e1be | |
| parent | a43679d13c45f869dc514a4510ce6a06382bbeb3 (diff) | |
| parent | 81549baff4a25da3d279e2a240d9878c04857270 (diff) | |
| download | CMake-6940a67d479e722521a3f84d816858b860d09e71.zip CMake-6940a67d479e722521a3f84d816858b860d09e71.tar.gz CMake-6940a67d479e722521a3f84d816858b860d09e71.tar.bz2 | |
Merge topic 'try_compile-cross-app-bundles'
81549baff4 try_compile: Fix COPY_FILE with app-bundles on non-macOS hosts
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7377
| -rw-r--r-- | Source/cmCoreTryCompile.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index 6776056..45afdd1 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/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) { |