packages/cmake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!15 update cmake to 3.18.0

Browse Source 
Merge pull request !15 from wangchen/wangchen
This commit is contained in:
openeuler-ci-bot 2020-07-31 18:02:26 +08:00 committed by Gitee
commit 4fec38c2b2
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
cmake-3.17.2.tar.gz → cmake-3.18.0.tar.gz Executable file → Normal file
View File

Binary file not shown.

20
cmake-findruby.patch
View File

@ -3,19 +3,19 @@ Index: cmake-3.17.2/Modules/FindRuby.cmake
--- cmake-3.17.2.orig/Modules/FindRuby.cmake --- cmake-3.17.2.orig/Modules/FindRuby.cmake
+++ cmake-3.17.2/Modules/FindRuby.cmake +++ cmake-3.17.2/Modules/FindRuby.cmake
@@ -110,14 +110,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO @@ -110,14 +110,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO
_RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR) _RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR)
_RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR)
- # vendor_ruby available ? - # vendor_ruby available ?
- execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'" - execute_process(COMMAND ${Ruby_EXECUTABLE} -r vendor-specific -e "print 'true'"
- OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET) - OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY ERROR_QUIET)
- -
- if(RUBY_HAS_VENDOR_RUBY) - if(Ruby_HAS_VENDOR_RUBY)
- _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR) - _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
- _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR) - _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
- endif() - endif()
+ _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR) + _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
+ _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_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 # 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)

16
cmake.spec
View File

@ -9,20 +9,20 @@
%{?rcsuf:%global versuf -%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}}
Name: cmake Name: cmake
Version: 3.17.2 Version: 3.18.0
Release: 1 Release: 1
Summary: Cross-platform make system Summary: Cross-platform make system
License: BSD and MIT and zlib License: BSD and MIT and zlib
URL: http://www.cmake.org 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 Source1: cmake-init.el
Source2: macros.cmake Source2: macros.cmake
Source3: cmake.attr Source3: cmake.attr
Source4: cmake.prov Source4: cmake.prov
Source5: cmake.req Source5: cmake.req
Patch0001: cmake-findruby.patch Patch0: cmake-findruby.patch
Patch0002: cmake-fedora-flag_release.patch Patch1: cmake-fedora-flag_release.patch
Patch0003: cmake-mingw-dl.patch Patch2: cmake-mingw-dl.patch
BuildRequires: coreutils findutils gcc-c++ gcc-gfortran sed gdb BuildRequires: coreutils findutils gcc-c++ gcc-gfortran sed gdb
BuildRequires: emacs python3-devel pkgconfig(Qt5Widgets) desktop-file-utils 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}/aclocal/cmake.m4
%{_datadir}/bash-completion %{_datadir}/bash-completion
%{_emacs_sitelispdir}/cmake %{_emacs_sitelispdir}/cmake
%{_emacs_sitelispdir}/cmake-mode.el
%{_emacs_sitestartdir}/cmake-init.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 %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 %exclude %{_pkgdocdir}/Copyright.txt
%changelog %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 * Mon May 25 2020 licihua <licihua@huawei.com> - 3.17.2-1
- Update to cmake-3.17.2 - Update to cmake-3.17.2