This revision was automatically updated to reflect the committed changes.
Closed by commit rL269713: Look for CMake.app when searching for cmake
(authored by tfiala).
Changed prior to commit:
http://reviews.llvm.org/D20303?vs=57404&id=57412#toc
Repository:
rL LLVM
http://reviews.llvm.org/D20303
Files:
lldb/trunk/scripts/Xcode/build-llvm.py
Index: lldb/trunk/scripts/Xcode/build-llvm.py
===================================================================
--- lldb/trunk/scripts/Xcode/build-llvm.py
+++ lldb/trunk/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.
Index: lldb/trunk/scripts/Xcode/build-llvm.py
===================================================================
--- lldb/trunk/scripts/Xcode/build-llvm.py
+++ lldb/trunk/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.
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
