cmake 3.18.0

Closes #58306. Signed-off-by: Seeker <[email protected]> Signed-off-by: BrewTestBot <[email protected]>
Homebrew · Jul 23, 2020 · 7927380 · 7927380
1 parent 0c71cce
commit 7927380
Showing 1 changed file with 8 additions and 20 deletions.
diff --git a/Formula/cmake.rb b/Formula/cmake.rb
@@ -5,21 +5,14 @@ class Cmake < Formula
   head "https://gitlab.kitware.com/cmake/cmake.git"
 
   stable do
-    url "https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3.tar.gz"
-    sha256 "0bd60d512275dc9f6ef2a2865426a184642ceb3761794e6b65bff233b91d8c40"
+    url "https://github.com/Kitware/CMake/releases/download/v3.18.0/cmake-3.18.0.tar.gz"
+    sha256 "83b4ffcb9482a73961521d2bafe4a16df0168f03f56e6624c419c461e5317e29"
 
-    # Allows CMAKE_FIND_FRAMEWORKS to work with CMAKE_FRAMEWORK_PATH, which brew sets.
-    # Remove with 3.18.0.
+    # Allow customisation of emacs install directory.
+    # Remove with 3.18.1.
     patch do
-      url "https://gitlab.kitware.com/cmake/cmake/-/commit/c841d43d70036830c9fe16a6dbf1f28acf49d7e3.diff"
-      sha256 "87de737abaf5f8c071abc4a4ae2e9cccced6a9780f4066b32ce08a9bc5d8edd5"
-    end
-
-    # Adds macOS 11.0 compatibility.
-    # Remove with 3.18.0.
-    patch do
-      url "https://gitlab.kitware.com/cmake/cmake/-/commit/a0c4c27443afe1c423c08063e2eaf96ffa2f54fb.diff"
-      sha256 "7b84bc0dbb71c620939fb1e354f671e1d0007c9c8060ed3f2afe54a11f5e578c"
+      url "https://gitlab.kitware.com/cmake/cmake/-/commit/24571e8eca27d6c51ca408f4b834fa930760e1d0.diff"
+      sha256 "7234977c8bfa0822bc57867a04f22ecc0347241bb06c7ba99b0d86681c64aa73"
     end
   end
 
@@ -59,15 +52,10 @@ def install
       --system-curl
     ]
 
-    # There is an existing issue around macOS & Python locale setting
-    # See https://bugs.python.org/issue18378#msg215215 for explanation
-    ENV["LC_ALL"] = "en_US.UTF-8"
-
-    system "./bootstrap", *args, "--", *std_cmake_args
+    system "./bootstrap", *args, "--", *std_cmake_args,
+                                       "-DCMake_INSTALL_EMACS_DIR=#{elisp}"
     system "make"
     system "make", "install"
-
-    elisp.install "Auxiliary/cmake-mode.el"
   end
 
   test do