SHA256
3
0
forked from pool/cmake

- Mark macros as %config

- use curl-devel to build with as the internal libcurl is broken
  with https bnc#892256
- Run tests to avoid such bugs in future
- Provide %ctest macro for testing to avoid people having to
  remember all the arguments

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=168
This commit is contained in:
Tomáš Chvátal 2014-08-18 08:21:42 +00:00 committed by Git OBS Bridge
parent 3efe344b00
commit b5260f393c
3 changed files with 26 additions and 2 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Aug 18 08:20:28 UTC 2014 - tchvatal@suse.com
- Mark macros as %config
- use curl-devel to build with as the internal libcurl is broken
with https bnc#892256
- Run tests to avoid such bugs in future
- Provide %ctest macro for testing to avoid people having to
remember all the arguments
-------------------------------------------------------------------
Sun Aug 10 14:33:05 UTC 2014 - andreas.stieger@gmx.de

View File

@ -2,6 +2,7 @@
# Macros for cmake
#
%__cmake %{_bindir}/cmake
%__ctest %{_bindir}/ctest
%_cmake_debug %{?with_debug:debug}%{?!with_debug:release}
%cmake \
@ -38,3 +39,8 @@
cd build \
make DESTDIR=%{buildroot} install/fast \
cd ..
%ctest \
cd build \
%__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} \
cd ..

View File

@ -29,6 +29,7 @@ Source2: opensuse_rules.cmake
Patch2: cmake-fix-ruby-test.patch
#PATCH-FIX-UPSTREAM dvaleev@suse.com https://github.com/Kitware/CMake/pull/111.patch
Patch3: cmake-ppc64le-jni.patch
BuildRequires: curl-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: libexpat-devel
@ -59,7 +60,6 @@ export CFLAGS="$CXXFLAGS"
--docdir=/share/doc/packages/%{name} \
--mandir=/share/man \
--system-libs \
--no-system-curl \
%if 0%{?suse_version} <= 1110
--no-system-libarchive \
%endif
@ -82,9 +82,17 @@ sed -i \
%fdupes %{buildroot}%{_datadir}/cmake
%check
# Excluded tests:
# TestUpload: uses internet connection
# SimpleInstall: seems to fail due to RPATH strictness
# if any other app installs then this test is bogus
./bin/ctest --force-new-ctest-process --output-on-failure %{?_smp_mflags} \
-E "(TestUpload|SimpleInstall|SimpleInstall-Stage2)"
%files
%defattr(-,root,root)
%{_sysconfdir}/rpm/macros.cmake
%config %{_sysconfdir}/rpm/macros.cmake
%{_bindir}/cpack
%{_bindir}/cmake
%{_bindir}/ctest