summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-09-24 13:21:50 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-09-24 13:21:50 (GMT)
commit17a457dcb02e351efe5d1dd093c9443ba206667a (patch)
tree4e6339d668888609e2f3abef9cd6b0a2c78f7198
parentefd16ba928476bc1a576efc16d666661d31f0f49 (diff)
parent55a885da00985823253827e2e44f9e02f2999b71 (diff)
downloadCMake-17a457dcb02e351efe5d1dd093c9443ba206667a.zip
CMake-17a457dcb02e351efe5d1dd093c9443ba206667a.tar.gz
CMake-17a457dcb02e351efe5d1dd093c9443ba206667a.tar.bz2
Merge topic 'fix_search_path_ios_trycompile'
55a885da Teach try_compile COPY_FILE to look for IOS app bundles.
-rw-r--r--Source/cmCoreTryCompile.cxx4
1 files changed, 4 insertions, 0 deletions
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();