From 85df931dea607ef0c411ce6c01fe60afb5aa8d6a Mon Sep 17 00:00:00 2001
From: Todd Fiala <todd.fiala@gmail.com>
Date: Mon, 16 May 2016 22:29:15 +0000
Subject: [PATCH] Look for CMake.app when searching for cmake

On OS X systems, look for /Applications/CMake.app and ~/Applications/CMake.app
versions of the cmake command line binary when trying harder to find a cmake not
on the system path.

Reviewers: clayborg

Subscribers: lldb-commits

Differential Revision: http://reviews.llvm.org/D20303

llvm-svn: 269713
---
 lldb/scripts/Xcode/build-llvm.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lldb/scripts/Xcode/build-llvm.py b/lldb/scripts/Xcode/build-llvm.py
index 453969a90efe..4e2a67a589cc 100755
--- a/lldb/scripts/Xcode/build-llvm.py
+++ b/lldb/scripts/Xcode/build-llvm.py
@@ -3,6 +3,7 @@
 import errno
 import hashlib
 import os
+import platform
 import subprocess
 import sys
 
@@ -243,6 +244,23 @@ def find_cmake ():
         "/opt/local/bin",
         os.path.join(os.path.expanduser("~"), "bin")
     ]
+
+    if platform.system() == "Darwin":
+        # Add locations where an official CMake.app package may be installed.
+        extra_cmake_dirs.extend([
+           os.path.join(
+               os.path.expanduser("~"),
+               "Applications",
+               "CMake.app",
+               "Contents",
+               "bin"),
+           os.path.join(
+               os.sep,
+               "Applications",
+               "CMake.app",
+               "Contents",
+               "bin")])
+
     cmake_binary = find_executable_in_paths("cmake", extra_cmake_dirs)
     if cmake_binary:
         # We found it in one of the usual places.  Use that.