testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity

Accepting request 344116 from home:mathletic:branches:devel:tools:building

Browse Source 
update to version 3.4.0

OBS-URL: https://build.opensuse.org/request/show/344116
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=230
This commit is contained in:
Martin Pluskal 2015-11-13 07:13:54 +00:00 committed by Git OBS Bridge
parent c91d96b115
commit ca254c3cd6
11 changed files with 76 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch
View File

@ -1,40 +0,0 @@
From b9ec9392da21a3421e48c6961976060d872faffb Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eike@sf-mail.de>
Date: Tue, 18 Aug 2015 12:14:43 +0200
Subject: [PATCH] FindPkgConfig: remove variable dereference
If CMAKE_MINIMUM_REQUIRED_VERSION is not set because no
cmake_minimum_required() call is present this line can lead to an error as that
string is empty so too few arguments are passed to if():
See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeOutput.log".
See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeError.log".
CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:112 (elseif):
given arguments:
"VERSION_LESS" "3.1"
Unknown arguments specified
Call Stack (most recent call first):
/usr/share/cmake/Modules/FindPkgConfig.cmake:501 (_pkgconfig_parse_options)
/usr/share/cmake/Modules/FindOpenSSL.cmake:43 (pkg_check_modules)
---
Modules/FindPkgConfig.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 526a62e..ae6903e 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -109,7 +109,7 @@ macro(_pkgconfig_parse_options _result _is_req _is_silent _no_cmake_path _no_cma
set(${_no_cmake_path} 1)
set(${_no_cmake_environment_path} 1)
endif()
- elseif(${CMAKE_MINIMUM_REQUIRED_VERSION} VERSION_LESS 3.1)
+ elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1)
set(${_no_cmake_path} 1)
set(${_no_cmake_environment_path} 1)
endif()
--
1.7.10.4

17
cmake-3.3.2-SHA-256.txt
View File

@ -1,17 +0,0 @@
ebb1c11025ce3d903c4236f6266b76c9ff5998a32a631b50e6838ba8bb064611 cmake-3.3.2-Darwin-universal.dmg
e37eb90e7e74adc75a53d254abff058a6915d0e1b015b735e63955648ea0b8b3 cmake-3.3.2-Darwin-universal.tar.Z
9a53972f07819812a32ae8b9e18bdac0acf58d372b55967701a041fcb9d09c9e cmake-3.3.2-Darwin-universal.tar.gz
077ab2751b15e4d2debfbdbcab205e6dc59f49466cd12622b3f604cc6aebef85 cmake-3.3.2-Darwin-x86_64.dmg
bcaba3dd3b1590e4ed59fb6872b058cf7f594bdd509b8643e411331845499263 cmake-3.3.2-Darwin-x86_64.tar.Z
7e685d4e2ef90e0b9b837138049c98f4b0cbda2ee27db77c3d39b6053b7a7e71 cmake-3.3.2-Darwin-x86_64.tar.gz
a5edea3902936e0ceeb92a5ac7aac211557504eed4321fcdf6415637a1bc45ff cmake-3.3.2-Linux-i386.sh
1ab86b42fae3664a79d510d062ef0e8ede74d35bbe6655e631dafca50483e98b cmake-3.3.2-Linux-i386.tar.Z
330b7bc01c6d790a66da08d16cd30b1e0538a32fca148b42fe5fe4be4cd01ca0 cmake-3.3.2-Linux-i386.tar.gz
43951fded25c660cc564308fd80d603b758926d125749837f08d3df54a0af99c cmake-3.3.2-Linux-x86_64.sh
e88c086b531fd3aa834311f912aeba7b48a27650c9fea40073f405f317a483c4 cmake-3.3.2-Linux-x86_64.tar.Z
0c6e1d1dedf58b21f6bd3de9f03ca435c3d13c4e709b1d67432ca12df07d8208 cmake-3.3.2-Linux-x86_64.tar.gz
21e224f41f0e406deb4086b761eea7511d24d6d173cb9861c0c4460b8f169fb1 cmake-3.3.2-win32-x86.exe
eaaa54ebb915fe56f4117edf78d9f8197623e8559918860079d3c63a075f58db cmake-3.3.2-win32-x86.zip
2cbd5bf6d2b52e5cb1de4fa40e945661b9768cf63d4fe8d726c8365f848a3a85 cmake-3.3.2.tar.Z
e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22 cmake-3.3.2.tar.gz
eed276d12e34cde4a1c59688036d9b928f05559ab37e1a29680ca33de248db4a cmake-3.3.2.zip

17
cmake-3.3.2-SHA-256.txt.asc
View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJV+vCeAAoJEC0s7xA0khaE3rIQAJv1nBVafm4hSXuPx6dYdaJB
e6os7Foa81We7eXxES9aLVatV4rGPdpMVZp7ydEt0cS0TZRBBrTE23GAxCFZSWzV
GlXFls6aYk3uJKUzAv+HgWMjcq771/83hNrh8vx3SrAml58wa37TO9rnXlvquNlQ
ADEvOsFA+keMVKMUMqRJkEaD5rDGlsguGvBVshKC7pRH6pxY4/tGGoBPAZn3zQ8D
3qbn2iWn6nq+9VlU9Cru9L47tKk+Po1ufhwLeWq/rjuxPu4eNVvHFj5LfqiWOwlV
Y+ONdTml4raRKnSR5lotPjzQ8zphr9Kah3fH4XtT1gOsdXGLdASXu5zgenJEpEWQ
0SHcnAacMK8eL4rc2t0mW70e9/2ieCNc4AqVMPX/tPlLcIAjTslojg57Y8Tm2t2L
nNChmqgLjQIlJw55RGqtck20kWNBT3DXXgEGvhSqSbvNbQe8R3F2G6wFEwVIKVgt
ETWtt1iwEmJV5cm7oHp/t060JHD+NDBBTO9smAaWXPygeU5vtS/6mgxs3hEnaGVl
tnwGYu8jQGqB5eBMN8yZ2aKqtOWjWdT2v0REYbilgZRqaVBJywqomyOsov3/lVPi
yNdA/dcNXki7zWq7DyXYAF4i4LtCsVqd33N4Q0+Uoj4SpUxkXaVFGtWt3X3JHZh0
W6y5T0nirJfPeCsHyjat
=GpYS
-----END PGP SIGNATURE-----

3
cmake-3.3.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22
size 6578184

14
cmake-3.4.0-SHA-256.txt Normal file
View File

@ -0,0 +1,14 @@
fa10ea60e59f6d80dbe4b98cb10ba810d466cb2e2eaf067a0095e77703576b09 cmake-3.4.0-Darwin-x86_64.dmg
0b8640536aad2b2acd3d33bbd81d569465f3b827a6eb53dd0f34d0269864f484 cmake-3.4.0-Darwin-x86_64.tar.Z
6f969af7abfcdc1a9b24aae14bc3a47952361bbcda9278b5237c6858ca740744 cmake-3.4.0-Darwin-x86_64.tar.gz
21641c4ff385221fcde2d2be103fb26c1ed0dc650539afe4f6db5ee0ecca010b cmake-3.4.0-Linux-i386.sh
fc4fcdf43c788fedba9a51f63b033d662bb4df01d167a4522b8b58292c95102b cmake-3.4.0-Linux-i386.tar.Z
c5da51e3ac5842bdfd5adc4fe85023b32ffffdc5a4ccca14882435ce30abe930 cmake-3.4.0-Linux-i386.tar.gz
ec86bf6f80edc3bb228fdee20db85aa5e7a53a2583b1cd0e0ae014cbd7dca558 cmake-3.4.0-Linux-x86_64.sh
8824578aa5fb6c57f1c28022d193e281485b34e08179f4a752cdc367c2bdff82 cmake-3.4.0-Linux-x86_64.tar.Z
36c275e5c143f61dc3978f0cf5502a848cfbc09f166a72a2db4427c6f05ab2aa cmake-3.4.0-Linux-x86_64.tar.gz
b5a4aaa96dfe2413d613de9cc99e87f86510a87486b02221e6aa230620f550d0 cmake-3.4.0-win32-x86.exe
a9cddbce6bf577000fccb734551dc1e72d576f180f0788dd38cbf5be2f7e8ae5 cmake-3.4.0-win32-x86.zip
908823a7db57b78d1012b0882dfde27211df7d146661d5cab78285b5330acd99 cmake-3.4.0.tar.Z
a5b82bf6ace6c481cdb911fd5d372a302740cbefd387e05297cb37f7468d1cea cmake-3.4.0.tar.gz
de8b1924e83ead6165edd0793bcf3db3896138af6d77730f33ef4721f2790b54 cmake-3.4.0.zip

17
cmake-3.4.0-SHA-256.txt.asc Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJWRNZBAAoJEC0s7xA0khaExGgP/2/8flXuoH93fgl/uWBB8Zhy
nZXu+OzE5IBG3fz0zz6tZ+u9AuKDlxBKM69F/VrweoNHa07BNvVVWDd46i3ecxyS
QHgkthl0X2vZ6GB0IHCUV3C3i3aiyqL5D/OM4IdO0UZKICYQwpSpaKYN+gf90RDj
T5tH20iaEJqqExh1diYEQlfmzsJ11aHJP1ANuX+8sTcP4XlFaM8WRzz4xumpkiDy
4WJVKkglsidD78/Q5Jl/2WlrzeBbVxg58IE9DlMoFwo8nClVbohT/BjO2dzIjOk/
FIjJX5pixVFSHTVHVlhvEn5Fd1qZXAw18O5eHodX5qdJKX06Qz6yUOdfCiBAY4vc
FP7ILK4e785ndk4fRQicDnIHGduQ+WxUw/pUKelu3umOkHKMxj2sm68wcUDvGVRu
asHqO0Y592t0yf482Nft2Eq1mKVgwJ06oO/5BLWbVBs4nH/UDrD0YmdW2ynk76d8
V4hAkiml6JO5FpQE4A+932cg2jKfz37SHHkg1II16LWsOK9/zYIHj853qGHkOqmI
4GI6++sMa09u1b0Z9VOHJZoRWYqN9iVizgjQI5kkxdOwCBwQOhJ0lpodq41wQyPC
MD2wXhy+Pc3AoOJbivzCOcPQOjkUB75ZEYwNmmvhGx5b72rb3NHnw6REH7tRFuuP
ROGSZAGd5PKil3vyDzpe
=tKWD
-----END PGP SIGNATURE-----

3
cmake-3.4.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a5b82bf6ace6c481cdb911fd5d372a302740cbefd387e05297cb37f7468d1cea
size 6719859

16
cmake-gui.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Nov 12 22:23:37 UTC 2015 - foss@grueninger.de
- Update to 3.4.0
* The "if()" command learned a new "TEST" operator that evaluates to
true if a given test name has been defined by the "add_test()"
command. See policy "CMP0064".
* The "install(DIRECTORY)" command "DESTINATION" option learned to
support "generator expressions".
* The "install(FILES)" command "DESTINATION" option learned to
support "generator expressions".
* CMake learned to honor "*.manifest" source files with MSVC tools.
Manifest files named as sources of ".exe" and ".dll" targets will be
merged with linker-generated manifests and embedded in the binary.
Full changelog see http://kitware.com/blog/home/post/1002
-------------------------------------------------------------------
Fri Sep 18 12:26:52 UTC 2015 - foss@grueninger.de

8
cmake-gui.spec
View File

@ -17,15 +17,15 @@
Name: cmake-gui
Version: 3.3.2
Version: 3.4.0
Release: 0
Summary: CMake graphical user interface
License: BSD-3-Clause
Group: Development/Tools/Building
Url: http://www.cmake.org/
Source0: http://www.cmake.org/files/v3.3/cmake-%{version}.tar.gz
Source5: http://www.cmake.org/files/v3.3/cmake-%{version}-SHA-256.txt
Source6: http://www.cmake.org/files/v3.3/cmake-%{version}-SHA-256.txt.asc
Source0: http://www.cmake.org/files/v3.4/cmake-%{version}.tar.gz
Source5: http://www.cmake.org/files/v3.4/cmake-%{version}-SHA-256.txt
Source6: http://www.cmake.org/files/v3.4/cmake-%{version}-SHA-256.txt.asc
Source7: cmake.keyring
# PATCH-FIX-UPSTREAM form.patch -- set the correct include path for the ncurses includes
Patch4: form.patch

18
cmake.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Thu Nov 12 21:43:23 UTC 2015 - foss@grueninger.de
- Update to 3.4.0
* The "if()" command learned a new "TEST" operator that evaluates to
true if a given test name has been defined by the "add_test()"
command. See policy "CMP0064".
* The "install(DIRECTORY)" command "DESTINATION" option learned to
support "generator expressions".
* The "install(FILES)" command "DESTINATION" option learned to
support "generator expressions".
* CMake learned to honor "*.manifest" source files with MSVC tools.
Manifest files named as sources of ".exe" and ".dll" targets will be
merged with linker-generated manifests and embedded in the binary.
Full changelog see http://kitware.com/blog/home/post/1002
- Drop patche included in upstream
* cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch
-------------------------------------------------------------------
Mon Sep 21 08:40:41 UTC 2015 - tchvatal@suse.com

11
cmake.spec
View File

@ -17,27 +17,25 @@
Name: cmake
Version: 3.3.2
Version: 3.4.0
Release: 0
Summary: Cross-platform, open-source make system
License: BSD-3-Clause
Group: Development/Tools/Building
Url: http://www.cmake.org/
Source0: http://www.cmake.org/files/v3.3/%{name}-%{version}.tar.gz
Source0: http://www.cmake.org/files/v3.4/%{name}-%{version}.tar.gz
Source1: cmake.macros
Source2: opensuse_rules.cmake
Source3: cmake.attr
Source4: cmake.prov
Source5: http://www.cmake.org/files/v3.3/%{name}-%{version}-SHA-256.txt
Source6: http://www.cmake.org/files/v3.3/%{name}-%{version}-SHA-256.txt.asc
Source5: http://www.cmake.org/files/v3.4/%{name}-%{version}-SHA-256.txt
Source6: http://www.cmake.org/files/v3.4/%{name}-%{version}-SHA-256.txt.asc
Source7: cmake.keyring
Patch2: cmake-fix-ruby-test.patch
# PATCH-FIX-UPSTREAM form.patch -- set the correct include path for the ncurses includes
Patch4: form.patch
# PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs
Patch5: system-libs.patch
# PATCH-FIX-UPSTREAM cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch - Resolve the issue when cmake:minimum_required is not set
Patch6: cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch
BuildRequires: curl-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
@ -69,7 +67,6 @@ echo "`grep %{name}-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOU
%patch2 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
export CXXFLAGS="%{optflags}"