rpms/cmake
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged update from upstream sources

Browse Source 
This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/cmake.git#5db80372484f05e17443471f5d93e5bb6c638592
This commit is contained in:
DistroBaker 2020-11-20 19:06:30 +00:00
parent 944c7e2164
commit ee4284d2d0
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake.spec
View File

@ -62,7 +62,7 @@
%{?rcsuf:%global versuf -%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}}
# For handling bump release by rpmdev-bumpspec and mass rebuild # For handling bump release by rpmdev-bumpspec and mass rebuild
%global baserelease 2 %global baserelease 3
# Uncomment if building for EPEL # Uncomment if building for EPEL
#global name_suffix %%{major_version} #global name_suffix %%{major_version}
@ -512,6 +512,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog %changelog
* Fri Nov 20 08:32:34 EST 2020 Neal Gompa <ngompa13@gmail.com> - 3.18.4-3
- Ensure CMake does not strip binaries with package builds
* Mon Nov 09 2020 Miro Hrončok <mhroncok@redhat.com> - 3.18.4-2 * Mon Nov 09 2020 Miro Hrončok <mhroncok@redhat.com> - 3.18.4-2
- Add support for Python 3.10 - Add support for Python 3.10

2
macros.cmake
View File

@ -13,6 +13,7 @@
# - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables # - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables
# and default to -O3 -DNDEBUG. Strip the -O3 so we can override with *FLAGS # and default to -O3 -DNDEBUG. Strip the -O3 so we can override with *FLAGS
# - Turn on verbose makefiles so we can see and verify compile flags # - Turn on verbose makefiles so we can see and verify compile flags
# - Turn off stripping by default so RPM can do it separately
# - Set default install prefixes and library install directories # - Set default install prefixes and library install directories
# - Turn on shared libraries by default # - Turn on shared libraries by default
%cmake \ %cmake \
@ -32,6 +33,7 @@
-DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
-DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
-DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
-DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
-DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\