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

Use %%set_build_flags inside macros.cmake if available

Browse Source
This commit is contained in:
Björn Esser 2020-01-15 11:40:16 +01:00
parent 062da0a4bf
commit 202d11b3d1
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake.spec
View File

@ -496,6 +496,7 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
- Update to 3.16.2 - Update to 3.16.2
- Use %%_vpath_builddir for out-of-tree build - Use %%_vpath_builddir for out-of-tree build
- Use %%set_build_flags to export build flags if available - Use %%set_build_flags to export build flags if available
- Use %%set_build_flags inside macros.cmake if available
* Tue Jan 14 2020 Miro Hrončok <mhroncok@redhat.com> - 3.16.1-2 * Tue Jan 14 2020 Miro Hrončok <mhroncok@redhat.com> - 3.16.1-2
- FindPython: Add support for version 3.9 - FindPython: Add support for version 3.9

4
macros.cmake
View File

@ -14,11 +14,15 @@
# - 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 \
%if 0%{?set_build_flags:1} \
%set_build_flags \
%else \
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \ FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS ; \ FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS ; \
%{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \ %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
%endif \
%__cmake \\\ %__cmake \\\
-DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
-DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\