feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Improve cmake setup on Apple

Browse Source 
Users tend to select cmake.app, which is actually a GUI for cmake and
not what Creator expects. So check for the proper binary in the bundle
and return that if it exists.

Change-Id: I1668baa6236ee4ae88da200cef257b636f7a9e72
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2016-09-14 12:56:32 +02:00
parent 2244e2b26c
commit dfbb0b64b9
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cmakeprojectmanager/cmaketool.cpp
View File

@@ -139,6 +139,12 @@ QVariantMap CMakeTool::toMap() const
Utils::FileName CMakeTool::cmakeExecutable() const Utils::FileName CMakeTool::cmakeExecutable() const
{ {
if (Utils::HostOsInfo::isMacHost() && m_executable.endsWith(".app")) {
Utils::FileName toTest = m_executable;
toTest = toTest.appendPath("Contents/bin/cmake");
if (toTest.exists())
return toTest;
}
return m_executable; return m_executable;
} }