Fix cmake file installation some more (bz 1930389).

This commit is contained in:
Jerry James 2021-02-22 09:28:56 -07:00
parent 000c049388
commit a4b9df0c98

View File

@ -1,7 +1,7 @@
Name: tbb Name: tbb
Summary: The Threading Building Blocks library abstracts low-level threading details Summary: The Threading Building Blocks library abstracts low-level threading details
Version: 2020.3 Version: 2020.3
Release: 4%{?dist} Release: 5%{?dist}
License: ASL 2.0 License: ASL 2.0
URL: http://threadingbuildingblocks.org/ URL: http://threadingbuildingblocks.org/
@ -168,10 +168,11 @@ ln -s libirml.so.1 $RPM_BUILD_ROOT%{_libdir}/libirml.so
popd popd
# Install the cmake files # Install the cmake files
mkdir -p $RPM_BUILD_ROOT%{_libdir}/cmake cmake \
cmake -DTBB_ROOT=$RPM_BUILD_ROOT%{_prefix} -DTBB_OS=Linux \ -DINSTALL_DIR=$RPM_BUILD_ROOT%{_libdir}/cmake/TBB \
-P cmake/tbb_config_generator.cmake -DSYSTEM_NAME=Linux \
mv $RPM_BUILD_ROOT%{_prefix}/cmake $RPM_BUILD_ROOT%{_libdir}/cmake/TBB -DLIB_REL_PATH=../.. \
-P cmake/tbb_config_installer.cmake
%files %files
%doc doc/Release_Notes.txt README.md %doc doc/Release_Notes.txt README.md
@ -200,6 +201,9 @@ mv $RPM_BUILD_ROOT%{_prefix}/cmake $RPM_BUILD_ROOT%{_libdir}/cmake/TBB
%{python3_sitearch}/__pycache__/TBB* %{python3_sitearch}/__pycache__/TBB*
%changelog %changelog
* Mon Feb 22 2021 Jerry James <loganjerry@gmail.com> - 2020.3-5
- Fix cmake file installation some more (bz 1930389)
* Thu Feb 18 2021 Jerry James <loganjerry@gmail.com> - 2020.3-4 * Thu Feb 18 2021 Jerry James <loganjerry@gmail.com> - 2020.3-4
- Fix cmake file installation (bz 1930389) - Fix cmake file installation (bz 1930389)
- Allow use of RTM instructions when available - Allow use of RTM instructions when available