[Lldb-commits] [PATCH] D20303: Look for CMake.app when searching for cmake

[Todd Fiala via lldb-commits]

tfiala created this revision.
tfiala added a reviewer: spyffe.
tfiala added a subscriber: lldb-commits.

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.

http://reviews.llvm.org/D20303

Files:
  scripts/Xcode/build-llvm.py

Index: scripts/Xcode/build-llvm.py
===================================================================
--- scripts/Xcode/build-llvm.py
+++ 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 @@
         "/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.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D20303.57404.patch
Type: text/x-patch
Size: 1040 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20160516/78b48222/attachment.bin>