This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via f0185ff14a1c25dc603e207fbf3cc73457c5990c (commit)
via 275b6b3194e09a77247dc863ad5259cee316d6dc (commit)
from 1820c7e780e827a509a340835229d7075f5d1d1e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0185ff14a1c25dc603e207fbf3cc73457c5990c
commit f0185ff14a1c25dc603e207fbf3cc73457c5990c
Merge: 1820c7e 275b6b3
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon May 6 13:32:16 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon May 6 09:32:25 2019 -0400
Merge topic 'fix_ios_try_compile'
275b6b3194 iOS: Fix try_compile FILE_COPY not to fail
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3272
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=275b6b3194e09a77247dc863ad5259cee316d6dc
commit 275b6b3194e09a77247dc863ad5259cee316d6dc
Author: Alexandru Croitor <alexandru.croi...@qt.io>
AuthorDate: Tue Apr 30 12:41:06 2019 +0200
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon May 6 09:23:27 2019 -0400
iOS: Fix try_compile FILE_COPY not to fail
When building for iOS, the compiled target is placed into a bundle.
If a single-configuration generator is used, like Makefiles or Ninja,
the try_compile FILE_COPY behavior fails to find the bundle, because
it only looks for the bundle inside a Debug subfolder (presumably
to support a multi-configuration generator like Xcode).
Consider looking for the bundle in the root try_compile folder, as
well as in the location specified by CMAKE_TRY_COMPILE_CONFIGURATION.
Closes: #19211
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");
-----------------------------------------------------------------------
Summary of changes:
Source/cmCoreTryCompile.cxx | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
