rpms
/
cmake
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow valid short arguments for %%ctest macro 

Fixes rhbz#2127650
This commit is contained in:
Björn Esser 2022-10-30 13:56:05 +01:00
parent 59c57b9caa
commit 198fb99c98
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake.spec
View File

@ -68,7 +68,7 @@
%{?rcsuf:%global versuf -%{rcsuf}}
# For handling bump release by rpmdev-bumpspec and mass rebuild
%global baserelease 0.2
%global baserelease 0.3
# Uncomment if building for EPEL
#global name_suffix %%{major_version}
@ -531,6 +531,10 @@ popd
%changelog
* Sun Oct 30 2022 Björn Esser <besser82@fedoraproject.org> - 3.25.0-0.3.rc2
- Allow valid short arguments for %%ctest macro
Fixes rhbz#2127650
* Sun Oct 30 2022 Björn Esser <besser82@fedoraproject.org> - 3.25.0-0.2.rc2
- Drop non-upstream CMAKE_DL_LIBS windows patch
Fixes rhbz#2127529

5
macros.cmake
View File

@ -50,7 +50,7 @@
%cmake_install \
DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}"
%ctest(:-:) \
%ctest(:-:h:j:u:v:A:C:D:E:F:H:I:L:M:N:O:Q:R:S:T:U:V:) \
cd "%{__cmake_builddir}" \
%__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**} \
cd -
@ -59,4 +59,5 @@
%cmake@@CMAKE_MAJOR_VERSION@@ %cmake
%cmake@@CMAKE_MAJOR_VERSION@@_build %cmake_build
%cmake@@CMAKE_MAJOR_VERSION@@_install %cmake_install
%ctest@@CMAKE_MAJOR_VERSION@@(:-:) %ctest %{**}
%ctest@@CMAKE_MAJOR_VERSION@@(:-:h:j:u:v:A:C:D:E:F:H:I:L:M:N:O:Q:R:S:T:U:V:) \
%ctest %{**}