diff --git a/cmake-3.17.2.tar.gz b/cmake-3.18.0.tar.gz
old mode 100755
new mode 100644
similarity index 52%
rename from cmake-3.17.2.tar.gz
rename to cmake-3.18.0.tar.gz
index 1e4764fb1417d6df71c51d986068dd22028fc205..2f3aeae91d49a78fdb0c93dc45cfbe86ecc755c5
Binary files a/cmake-3.17.2.tar.gz and b/cmake-3.18.0.tar.gz differ
diff --git a/cmake-findruby.patch b/cmake-findruby.patch
index e8c358858b7f8eaa3a1761619b1fdf5fabb54374..ee9eafbd1131bdf9e042e63c1e947040a79fb6f9 100644
--- a/cmake-findruby.patch
+++ b/cmake-findruby.patch
@@ -3,19 +3,19 @@ Index: cmake-3.17.2/Modules/FindRuby.cmake
 --- cmake-3.17.2.orig/Modules/FindRuby.cmake
 +++ cmake-3.17.2/Modules/FindRuby.cmake
 @@ -110,14 +110,8 @@ if(RUBY_EXECUTABLE  AND NOT  RUBY_VERSIO
-   _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
-   _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
+   _RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR)
+   _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR)
  
 -  # vendor_ruby available ?
--  execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
--    OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY  ERROR_QUIET)
+-  execute_process(COMMAND ${Ruby_EXECUTABLE} -r vendor-specific -e "print 'true'"
+-    OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY  ERROR_QUIET)
 -
--  if(RUBY_HAS_VENDOR_RUBY)
--    _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
--    _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
+-  if(Ruby_HAS_VENDOR_RUBY)
+-    _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
+-    _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
 -  endif()
-+  _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
-+  _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
++  _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
++  _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
  
    # save the results in the cache so we don't have to run ruby the next time again
-   set(RUBY_VERSION_MAJOR    ${RUBY_VERSION_MAJOR}    CACHE PATH "The Ruby major version" FORCE)
+   set(Ruby_VERSION_MAJOR    ${Ruby_VERSION_MAJOR}    CACHE PATH "The Ruby major version" FORCE)
diff --git a/cmake.spec b/cmake.spec
index 5b165a0a49b6366ca3e4e656b40b70bb606bb653..a7adf56ec8b8d691f606be0a70d6371c869287da 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -9,20 +9,20 @@
 %{?rcsuf:%global versuf -%{rcsuf}}
 
 Name:           cmake
-Version:        3.17.2
+Version:        3.18.0
 Release:        1
 Summary:        Cross-platform make system
 License:        BSD and MIT and zlib
 URL:            http://www.cmake.org
-Source0:        https://www.cmake.org/files/v3.17/cmake-%{version}.tar.gz
+Source0:        https://www.cmake.org/files/v3.18/cmake-%{version}.tar.gz
 Source1:        cmake-init.el
 Source2:        macros.cmake
 Source3:        cmake.attr
 Source4:        cmake.prov
 Source5:        cmake.req
-Patch0001:      cmake-findruby.patch
-Patch0002:      cmake-fedora-flag_release.patch
-Patch0003:      cmake-mingw-dl.patch
+Patch0:         cmake-findruby.patch
+Patch1:         cmake-fedora-flag_release.patch
+Patch2:         cmake-mingw-dl.patch
 
 BuildRequires:  coreutils findutils gcc-c++ gcc-gfortran sed gdb
 BuildRequires:  emacs python3-devel pkgconfig(Qt5Widgets) desktop-file-utils
@@ -201,7 +201,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/aclocal/cmake.m4
 %{_datadir}/bash-completion
 %{_emacs_sitelispdir}/cmake
+%{_emacs_sitelispdir}/cmake-mode.el
 %{_emacs_sitestartdir}/cmake-init.el
+%{_datadir}/vim/vimfiles/indent/%{name}.vim
+%{_datadir}/vim/vimfiles//syntax/%{name}.vim
 
 %files filesystem -f data_dirs.mf -f lib_dirs.mf
 
@@ -230,6 +233,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %exclude %{_pkgdocdir}/Copyright.txt
 
 %changelog
+* Thu Jul 30 2020 wangchen <wangchen137@huawei.com> - 3.18.0-1
+- Update to cmake-3.18.0
+
 * Mon May 25 2020 licihua <licihua@huawei.com> - 3.17.2-1
 - Update to cmake-3.17.2