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, next has been updated
via 752fcaede3b811298a07b3326d22bd9bf1f77631 (commit)
via 55a885da00985823253827e2e44f9e02f2999b71 (commit)
via 069090e347078d1e3998e13e49d2d50dae013ef0 (commit)
from 2e5042a2523a1747cbc86f5febef6b76c8a40b1b (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=752fcaede3b811298a07b3326d22bd9bf1f77631
commit 752fcaede3b811298a07b3326d22bd9bf1f77631
Merge: 2e5042a 55a885d
Author: Bill Hoffman <bill.hoff...@kitware.com>
AuthorDate: Tue Sep 23 11:02:07 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Sep 23 11:02:07 2014 -0400
Merge topic 'fix_search_path_ios_trycompile' into next
55a885da Teach try_compile COPY_FILE to look for IOS app bundles.
069090e3 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55a885da00985823253827e2e44f9e02f2999b71
commit 55a885da00985823253827e2e44f9e02f2999b71
Author: Bill Hoffman <bill.hoff...@kitware.com>
AuthorDate: Tue Sep 23 10:59:08 2014 -0400
Commit: Bill Hoffman <bill.hoff...@kitware.com>
CommitDate: Tue Sep 23 10:59:08 2014 -0400
Teach try_compile COPY_FILE to look for IOS app bundles.
The COPY_FILE option on try_compile never looked for IOS application
bundles. This caused it to fail if the CMAKE_MACOSX_BUNDLE was set.
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index ed19851..bc5708d 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -634,6 +634,10 @@ void cmCoreTryCompile::FindOutputFile(const std::string&
targetName)
searchDirs.push_back(tmp);
}
searchDirs.push_back("/Debug");
+#if defined(__APPLE__)
+ std::string app = "/Debug/" + targetName + ".app";
+ searchDirs.push_back(app);
+#endif
searchDirs.push_back("/Development");
for(std::vector<std::string>::const_iterator it = searchDirs.begin();
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/cmCoreTryCompile.cxx | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
