Accepting request 356758 from devel:tools:building

1

OBS-URL: https://build.opensuse.org/request/show/356758
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=113
This commit is contained in:
Dominique Leuenberger 2016-02-11 11:36:24 +00:00 committed by Git OBS Bridge
commit 6e9a68dd56
13 changed files with 201 additions and 131 deletions

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

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

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-----

View File

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

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

@ -0,0 +1,14 @@
b3935bed969161570556b8f3e4850fd99da36efc632f413e3079b5b880c233e0 cmake-3.4.3-Darwin-x86_64.dmg
fbe47be04ba36b659a85861a26b1878c4626f9341e45b15b912f33c5812b136e cmake-3.4.3-Darwin-x86_64.tar.Z
dec18a78b8ed6b2ff24bd61d578063c2cd667327d62892592121cf600c83f635 cmake-3.4.3-Darwin-x86_64.tar.gz
2a8841d2667a80c37fafc1f6133ca21de12a9a98b5b0d752d2a673cee628fe63 cmake-3.4.3-Linux-i386.sh
944a892ca29ff825f865f3ee6c635fc6842dbe1420edc0ad4ac58dc8e33fccb0 cmake-3.4.3-Linux-i386.tar.Z
5dfe85abe8cf176975efe0ac025eb00d0b796e887fd4471d0f39b0ee816d916c cmake-3.4.3-Linux-i386.tar.gz
c56935444c8fcf7f6c8c48e0c7a94734291e21a709cacf27face7433e95f6cb6 cmake-3.4.3-Linux-x86_64.sh
20132aa571660ca483dba47223db6ee2e3115e9255357c576997d8cc4717dd0d cmake-3.4.3-Linux-x86_64.tar.Z
66b8d315c852908be9f79e1a18b8778714659fce4ddb2d041af8680a239202fc cmake-3.4.3-Linux-x86_64.tar.gz
ab4626ccba29cc38a14b5dcfc6aa49c881483c692e18d582c20086f61eb70e96 cmake-3.4.3-win32-x86.exe
448e894dd3df7f3f1ae509ab940f6fd5653ce86eba0677e19ad4bccb44a585ae cmake-3.4.3-win32-x86.zip
da854af6f97e46b0bb36e96d9ec65b33ca64cdebb883222e221eea401d2f0a36 cmake-3.4.3.tar.Z
b73f8c1029611df7ed81796bf5ca8ba0ef41c6761132340c73ffe42704f980fa cmake-3.4.3.tar.gz
ebe1087b1c3d9d7e996c94455fb967b213e2b432f28888f1787b2d4452c73dcb cmake-3.4.3.zip

View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJWpmfHAAoJEC0s7xA0khaEfXcP/1AVKL+lkGCnI+y4Js+rjEJ6
Sl420tjf8MquRV1OgILcShhjq6/vzNGJwN09ENpdKB5X72mqpxS9wRMg5vxPlgqw
O2FvDHevsZEeZAiSfHkWOKfRTF87+wcr5O+GFOxO49jmm75sWqxgpdONaHVDlJtx
9FQ78+/+Pf2knpqZ5PDZ9GKnBOszLtn9UPSgiFd6+TOavpuNpTDKoNJBnHnXAWPe
Jc2ppKcK6oFNDAgKqHvhAg1UU2WPr/flxtvbip3ZiNxfWJPLqqJpczAlKXuBWQZy
p15WNbM0ZMmFGtMWnxD5gmGKDtxmmobpSUNxHyld1EEdb6BVyOVZFa+zn3PhIFOD
+Cl5GabFBMkVC6lLmZr4WsnH3rDjqq5Wf3D7xBM0K8XLArZX99fKzcl73c+Xu+FZ
8FwUFb0RbWwOxaVfpAAO3loBU01cbm5bMpQClY2/XGZkV3pVLAM6RQvIYIu1HTK7
cLZGlXHMZD3kNbZW9by/t+2RspI+fwo+iNuM3u31DWYuWUjbYGuNIi/aztbWJSEI
XDt++2fY8SSuESyL7iXVTg/7bSq6FNUGY6C6Lb09ysKaZVCkwgegUqz6XtY0uf0z
cnZ3WD8ouD5XF8+SPyk0Fv9Jo1aVZkhNenqd0bPsnv26Dspv1F2FZ0d8kkjxrFj0
NDT+EsdTmpdVBY69EW63
=Updt
-----END PGP SIGNATURE-----

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

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

View File

@ -1,3 +1,65 @@
-------------------------------------------------------------------
Fri Jan 29 21:57:29 UTC 2016 - foss@grueninger.de
- update to 3.4.3
* Do not fail on Windows 10 with VS 2015 if no SDK is available
-------------------------------------------------------------------
Wed Jan 20 21:57:20 UTC 2016 - foss@grueninger.de
- update to 3.4.2
* cmSystemTools: Add VersionCompareEqual helper
* FindJava: Fix typos in IdlJ and JarSigner component implementation
-------------------------------------------------------------------
Thu Dec 3 10:54:32 UTC 2015 - tchvatal@suse.com
- Version update to 3.4.1:
* Fix auto export symbols for Dlls containing /bigobj for 64bit builds.
* Cray: Implement Fortran compiler version detection (#15845)
* MSVC: Fix linking with /MANIFEST:NO option
* Make C and C++ default dialect detection robust to advanced optimizations
* FindGTest: Refactor test type checks to avoid cases triggering CMP0064
* Android: Restore generation of non-versioned soname (#15851)
* Project: Guess default standard dialect if compiler was forced (#15852)
* Revert "Disable shared library support when compiler links statically"
* (#15855)
* Tests: Add case for add_subdirectory inside a function
* Tests: Add case for unmatched cmake_policy({PUSH,POP})
* Tests: Add case for package version file unmatched policy scope
* cmState: Skip variable scope snapshots to avoid call stack duplicates
* cmMakefile: Clarify purpose of method that pops a scope snapshot
* cmMakefile: Remove unused PolicyPushPop interfaces
* cmLocalGenerator: Use ScopePushPop RAII class to manage local variable
* scopes
* cmState: Enforce policy scope balancing around variable scopes
* cmLinkedTree: Rename 'Extend' method to 'Push'
* cmLinkedTree: Add Pop method
* cmListFileCache: Implement cmListFileBacktrace ctor/dtor out-of-line
* cmState: Avoid accumulating policy stack storage for short-lived scopes
* cmState: Avoid accumulating snapshot storage for short-lived scopes
* cmOrderDirectories: Factor out directory comparison
* cmOrderDirectories: Reduce repeat realpath() calls
* Include `sys/types.h` header to get `mode_t`
* Add NIOS2 CPU support
* cmELF: Avoid divide by zero if there are no dynamic section entries
-------------------------------------------------------------------
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

View File

@ -1,7 +1,7 @@
#
# spec file for package cmake-gui
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,15 +17,15 @@
Name: cmake-gui
Version: 3.3.2
Version: 3.4.3
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

View File

@ -1,3 +1,96 @@
-------------------------------------------------------------------
Fri Jan 29 21:56:25 UTC 2016 - foss@grueninger.de
- update to 3.4.3
* Do not fail on Windows 10 with VS 2015 if no SDK is available
-------------------------------------------------------------------
Wed Jan 20 21:57:01 UTC 2016 - foss@grueninger.de
- update to 3.4.2
* cmSystemTools: Add VersionCompareEqual helper
* FindJava: Fix typos in IdlJ and JarSigner component implementation
-------------------------------------------------------------------
Thu Dec 3 10:53:34 UTC 2015 - tchvatal@suse.com
- Version update to 3.4.1:
* Fix auto export symbols for Dlls containing /bigobj for 64bit builds.
* Cray: Implement Fortran compiler version detection (#15845)
* MSVC: Fix linking with /MANIFEST:NO option
* Make C and C++ default dialect detection robust to advanced optimizations
* FindGTest: Refactor test type checks to avoid cases triggering CMP0064
* Android: Restore generation of non-versioned soname (#15851)
* Project: Guess default standard dialect if compiler was forced (#15852)
* Revert "Disable shared library support when compiler links statically"
* (#15855)
* Tests: Add case for add_subdirectory inside a function
* Tests: Add case for unmatched cmake_policy({PUSH,POP})
* Tests: Add case for package version file unmatched policy scope
* cmState: Skip variable scope snapshots to avoid call stack duplicates
* cmMakefile: Clarify purpose of method that pops a scope snapshot
* cmMakefile: Remove unused PolicyPushPop interfaces
* cmLocalGenerator: Use ScopePushPop RAII class to manage local variable scopes
* cmState: Enforce policy scope balancing around variable scopes
* cmLinkedTree: Rename 'Extend' method to 'Push'
* cmLinkedTree: Add Pop method
* cmListFileCache: Implement cmListFileBacktrace ctor/dtor out-of-line
* cmState: Avoid accumulating policy stack storage for short-lived scopes
* cmState: Avoid accumulating snapshot storage for short-lived scopes
* cmOrderDirectories: Factor out directory comparison
* cmOrderDirectories: Reduce repeat realpath() calls
* Include `sys/types.h` header to get `mode_t`
* Add NIOS2 CPU support
* cmELF: Avoid divide by zero if there are no dynamic section entries
-------------------------------------------------------------------
Thu Dec 3 09:40:02 UTC 2015 - tchvatal@suse.com
- With all the cnages we dont need cmake.rules anymore, so try to
remove them completely and lets see what fails
-------------------------------------------------------------------
Tue Dec 1 20:27:34 UTC 2015 - tchvatal@suse.com
- Fixup rules as FLAGS and INCLUDES were split in 3.4
-------------------------------------------------------------------
Fri Nov 13 21:03:02 UTC 2015 - foss@grueninger.de
- Remove special paths for version 1110 and 1140
-------------------------------------------------------------------
Fri Nov 13 09:24:08 UTC 2015 - mpluskal@suse.com
- Revert removal of CMAKE_INSTALL_LIBDIR declaration from the
macros.
-------------------------------------------------------------------
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
- Remove CMAKE_INSTALL_LIBDIR declaration from the macros. rh#795542
* It is unfortunate but SOME packages will now have to define it
themselves because in some cases it is relative path while in
others it is absolute one.
-------------------------------------------------------------------
Fri Sep 18 12:26:13 UTC 2015 - foss@grueninger.de

View File

@ -11,11 +11,11 @@
cd build \
%__cmake .. \\\
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
-DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
-DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
-DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
-DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
-DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
-DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
-DCMAKE_BUILD_TYPE=None \\\
-DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \\\
-DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \\\
@ -32,8 +32,7 @@
-DBUILD_STATIC_LIBS:BOOL=OFF \\\
-DCMAKE_COLOR_MAKEFILE:BOOL=OFF \\\
-DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\
-DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules \\\
-DCMAKE_USER_MAKE_RULES_OVERRIDE="%{_datadir}/cmake/Modules/opensuse_rules.cmake"
-DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules
%make_jobs \
%__make %{?_smp_mflags} VERBOSE=1

View File

@ -1,7 +1,7 @@
#
# spec file for package cmake
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,27 +17,24 @@
Name: cmake
Version: 3.3.2
Version: 3.4.3
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++
@ -53,10 +50,8 @@ Requires: make
Requires: python-base
Recommends: cmake-mans
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1110
BuildRequires: libarchive-devel >= 3.0.2
BuildRequires: libbz2-devel
%endif
%description
CMake is a cross-platform, open-source build system
@ -69,7 +64,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}"
@ -95,11 +89,6 @@ mkdir -p %{buildroot}%{_libdir}/cmake
find %{buildroot}%{_datadir}/cmake -type f -print0 | xargs -0 chmod 644
# rpm macros
install -m644 %{SOURCE1} -D %{buildroot}%{_sysconfdir}/rpm/macros.cmake
# buildrules
install -m644 %{SOURCE2} -D %{buildroot}%{_datadir}/cmake/Modules/opensuse_rules.cmake
sed -i \
-e 's:OPTFLAGS:%{optflags}:g' \
%{buildroot}%{_datadir}/cmake/Modules/opensuse_rules.cmake
# RPM auto provides
install -p -m0644 -D %{SOURCE3} %{buildroot}%{_libexecdir}/rpm/fileattrs/cmake.attr
@ -108,30 +97,6 @@ install -p -m0755 -D %{SOURCE4} %{buildroot}%{_libexecdir}/rpm/cmake.prov
%fdupes %{buildroot}%{_datadir}/cmake
%check
%if 0%{?suse_version} <= 1140
# http://public.kitware.com/Bug/view.php?id=13237
# 0013237: 25 - FindPackageTest (Failed)
# Our 11.4 and older have . in PATH, as a result check fails.
# Having '.' in PATH is not needed anyway, so remove it here.
oIFS=$IFS
IFS=:
NPATH=
for path in $PATH
do
if test "$path" = "."
then
continue
fi
if test -n "$NPATH"
then
NPATH="$NPATH:$path"
else
NPATH="$path"
fi
done
IFS=$oIFS
export PATH=$NPATH
%endif
# Excluded tests:
# TestUpload: uses internet connection
# SimpleInstall: seems to fail due to RPATH strictness

View File

@ -1,6 +0,0 @@
SET (CMAKE_AR /usr/bin/ar CACHE FILEPATH "Archive manager" FORCE)
SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> OPTFLAGS <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
SET (CMAKE_RANLIB /usr/bin/ranlib CACHE FILEPATH "Archive index generator" FORCE)
SET (PKG_CONFIG_EXECUTABLE /usr/bin/pkg-config CACHE FILEPATH "pkg-config executable" FORCE)